@@ -1,7 +1,7 @@
include Makefile.am.in
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = . daxctl ndctl
+SUBDIRS = . daxctl/lib ndctl/lib ndctl
if ENABLE_DOCS
SUBDIRS += Documentation
endif
@@ -260,7 +260,8 @@ AC_SUBST([my_CFLAGS])
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_FILES([
Makefile
- daxctl/Makefile
+ daxctl/lib/Makefile
+ ndctl/lib/Makefile
ndctl/Makefile
test/Makefile
Documentation/Makefile
deleted file mode 100644
@@ -1,27 +0,0 @@
-include $(top_srcdir)/Makefile.am.in
-
-%.pc: %.pc.in Makefile
- $(SED_PROCESS)
-
-lib_LTLIBRARIES = lib/libdaxctl.la
-
-lib_libdaxctl_la_SOURCES =\
- libdaxctl.h \
- lib/libdaxctl-private.h \
- ../util/sysfs.c \
- ../util/sysfs.h \
- ../util/log.c \
- ../util/log.h \
- lib/libdaxctl.c
-
-EXTRA_DIST += lib/libdaxctl.sym
-
-lib_libdaxctl_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info $(LIBDAXCTL_CURRENT):$(LIBDAXCTL_REVISION):$(LIBDAXCTL_AGE) \
- -Wl,--version-script=$(top_srcdir)/daxctl/lib/libdaxctl.sym
-lib_libdaxctl_la_DEPENDENCIES = lib/libdaxctl.sym
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lib/libdaxctl.pc
-EXTRA_DIST += lib/libdaxctl.pc.in
-CLEANFILES += lib/libdaxctl.pc
new file mode 100644
@@ -0,0 +1,28 @@
+include $(top_srcdir)/Makefile.am.in
+
+%.pc: %.pc.in Makefile
+ $(SED_PROCESS)
+
+pkginclude_HEADERS = ../libdaxctl.h
+lib_LTLIBRARIES = libdaxctl.la
+
+libdaxctl_la_SOURCES =\
+ ../libdaxctl.h \
+ libdaxctl-private.h \
+ ../../util/sysfs.c \
+ ../../util/sysfs.h \
+ ../../util/log.c \
+ ../../util/log.h \
+ libdaxctl.c
+
+EXTRA_DIST += libdaxctl.sym
+
+libdaxctl_la_LDFLAGS = $(AM_LDFLAGS) \
+ -version-info $(LIBDAXCTL_CURRENT):$(LIBDAXCTL_REVISION):$(LIBDAXCTL_AGE) \
+ -Wl,--version-script=$(top_srcdir)/daxctl/lib/libdaxctl.sym
+libdaxctl_la_DEPENDENCIES = libdaxctl.sym
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libdaxctl.pc
+EXTRA_DIST += libdaxctl.pc.in
+CLEANFILES += libdaxctl.pc
@@ -1,38 +1,5 @@
include $(top_srcdir)/Makefile.am.in
-BUILT_SOURCES = libndctl.h
-lib/libndctl.h: libndctl.h.in
- touch $(top_srcdir)/version.m4
-
-%.pc: %.pc.in Makefile
- $(SED_PROCESS)
-
-pkginclude_HEADERS = libndctl.h
-lib_LTLIBRARIES = lib/libndctl.la
-
-lib_libndctl_la_SOURCES =\
- libndctl.h \
- lib/libndctl-private.h \
- ../util/log.c \
- ../util/log.h \
- ../util/sysfs.c \
- ../util/sysfs.h \
- lib/libndctl.c
-
-lib_libndctl_la_LIBADD =\
- ../daxctl/lib/libdaxctl.la \
- $(UDEV_LIBS) \
- $(UUID_LIBS) \
- $(KMOD_LIBS)
-
-if ENABLE_ARS
-lib_libndctl_la_SOURCES += lib/libndctl-ars.c
-endif
-
-if ENABLE_SMART
-lib_libndctl_la_SOURCES += lib/libndctl-smart.c
-endif
-
bin_PROGRAMS = ndctl
ndctl_SOURCES = ndctl.c \
@@ -71,17 +38,3 @@ ndctl_SOURCES += ../test/libndctl.c \
../test/parent-uuid.c \
../test/core.c
endif
-
-
-
-EXTRA_DIST += lib/libndctl.sym
-
-lib_libndctl_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info $(LIBNDCTL_CURRENT):$(LIBNDCTL_REVISION):$(LIBNDCTL_AGE) \
- -Wl,--version-script=$(top_srcdir)/ndctl/lib/libndctl.sym
-lib_libndctl_la_DEPENDENCIES = lib/libndctl.sym
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lib/libndctl.pc
-EXTRA_DIST += lib/libndctl.pc.in
-CLEANFILES += lib/libndctl.pc
new file mode 100644
@@ -0,0 +1,46 @@
+include $(top_srcdir)/Makefile.am.in
+
+BUILT_SOURCES = ../libndctl.h
+../libndctl.h: ../libndctl.h.in
+ touch $(top_srcdir)/version.m4
+
+%.pc: %.pc.in Makefile
+ $(SED_PROCESS)
+
+pkginclude_HEADERS = ../libndctl.h
+lib_LTLIBRARIES = libndctl.la
+
+libndctl_la_SOURCES =\
+ libndctl.h \
+ libndctl-private.h \
+ ../../util/log.c \
+ ../../util/log.h \
+ ../../util/sysfs.c \
+ ../../util/sysfs.h \
+ libndctl.c
+
+libndctl_la_LIBADD =\
+ ../../daxctl/lib/libdaxctl.la \
+ $(UDEV_LIBS) \
+ $(UUID_LIBS) \
+ $(KMOD_LIBS)
+
+if ENABLE_ARS
+libndctl_la_SOURCES += libndctl-ars.c
+endif
+
+if ENABLE_SMART
+libndctl_la_SOURCES += libndctl-smart.c
+endif
+
+EXTRA_DIST += libndctl.sym
+
+libndctl_la_LDFLAGS = $(AM_LDFLAGS) \
+ -version-info $(LIBNDCTL_CURRENT):$(LIBNDCTL_REVISION):$(LIBNDCTL_AGE) \
+ -Wl,--version-script=$(top_srcdir)/ndctl/lib/libndctl.sym
+libndctl_la_DEPENDENCIES = libndctl.sym
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libndctl.pc
+EXTRA_DIST += libndctl.pc.in
+CLEANFILES += libndctl.pc
When trying to add an "ndctl test" user of the util/log.c and util/sysfs.c routines, automake complained about util/log.o being already built for a library when trying to include it in the utility. Move the library build into ndctl/lib/ rather than re-using ndctl/. Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- Makefile.am | 2 +- configure.ac | 3 ++- daxctl/Makefile.am | 27 --------------------------- daxctl/lib/Makefile.am | 28 ++++++++++++++++++++++++++++ ndctl/Makefile.am | 47 ----------------------------------------------- ndctl/lib/Makefile.am | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 76 deletions(-) delete mode 100644 daxctl/Makefile.am create mode 100644 daxctl/lib/Makefile.am create mode 100644 ndctl/lib/Makefile.am