Don't use recursive make to build the lib subdirectory. Building the whole package worked, but things were not set up right to be able to compile just one tool like 'make fcoeadm'.
This keeps all the build rules in a single Makefile.am. Signed-off-by: Chris Leech <[email protected]> --- Makefile.am | 8 +++++--- configure.ac | 2 +- lib/Makefile.am | 3 --- 3 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 lib/Makefile.am diff --git a/Makefile.am b/Makefile.am index 5818384..64af335 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,3 @@ -# build libutil first -SUBDIRS = lib . - ## target programs, to be built and installed in $(prefix)/sbin sbin_PROGRAMS = fcoeadm fcoemon fcping fipvlan fcnsq fcrls @@ -46,6 +43,11 @@ fcoemon_LDFLAGS = -lrt fipvlan_SOURCES = fipvlan.c include/fip.h fipvlan_LDADD = lib/libutil.a +AUTOMAKE_OPTIONS=subdir-objects +noinst_LIBRARIES = lib/libutil.a +lib_libutil_a_SOURCES = lib/fcoe_utils.c lib/sa_log.c lib/sa_select.c \ + lib/sa_timer.c lib/sa_other.c lib/fip.c lib/rtnetlink.c + ## install configuration file in $(prefix)/etc/fcoe fcoe_configdir = ${sysconfdir}/fcoe dist_fcoe_config_DATA = etc/cfg-ethx diff --git a/configure.ac b/configure.ac index ebaaff1..a0f9c91 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,6 @@ AC_SUBST([HBAAPI_LIBS]) PKG_CHECK_MODULES([DCBD], [dcbd]) AC_SUBST([DCBD_CFLAGS]) -AC_CONFIG_FILES([Makefile lib/Makefile fcoe-utils.spec include/fcoe_utils_version.h]) +AC_CONFIG_FILES([Makefile fcoe-utils.spec include/fcoe_utils_version.h]) AC_OUTPUT diff --git a/lib/Makefile.am b/lib/Makefile.am deleted file mode 100644 index ebe259f..0000000 --- a/lib/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -AM_CPPFLAGS = -I${top_srcdir}/include -noinst_LIBRARIES = libutil.a -libutil_a_SOURCES = fcoe_utils.c sa_log.c sa_select.c sa_timer.c sa_other.c fip.c rtnetlink.c _______________________________________________ devel mailing list [email protected] http://www.open-fcoe.org/mailman/listinfo/devel
