This requires splitting the include-Makefile.am file into two separate ones, as the one for sub-directories (temporary) will keep the rule to build libblkid.la, while the other used by the top-level Makefile.am itself _cannot_ have it. Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 4 +- config/include-Makefile.am | 4 - config/include-sub-Makefile.am | 4 + configure.ac | 4 - shlibs/blkid/Makefile.am | 4 +- shlibs/blkid/docs/Makefile.am | 2 +- shlibs/blkid/samples/Makefile.am | 2 +- shlibs/blkid/src/Makefile.am | 73 ----------- shlibs/blkid/src/module.am | 195 ++++++++++++++++++++++++++++++ shlibs/blkid/src/partitions/Makefile.am | 22 ---- shlibs/blkid/src/superblocks/Makefile.am | 50 -------- shlibs/blkid/src/topology/Makefile.am | 14 -- shlibs/mount/Makefile.am | 2 +- shlibs/mount/docs/Makefile.am | 2 +- shlibs/mount/src/Makefile.am | 2 +- shlibs/uuid/Makefile.am | 2 +- shlibs/uuid/man/Makefile.am | 2 +- shlibs/uuid/src/Makefile.am | 2 +- 18 files changed, 212 insertions(+), 178 deletions(-) create mode 100644 config/include-sub-Makefile.am delete mode 100644 shlibs/blkid/src/Makefile.am create mode 100644 shlibs/blkid/src/module.am delete mode 100644 shlibs/blkid/src/partitions/Makefile.am delete mode 100644 shlibs/blkid/src/superblocks/Makefile.am delete mode 100644 shlibs/blkid/src/topology/Makefile.am diff --git a/Makefile.am b/Makefile.am index 42816f6..25d6f2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,7 +47,7 @@ if BUILD_LIBMOUNT SHLIBS_DIRS += shlibs/mount endif -SUBDIRS = \ +SUBDIRS = . \ $(SHLIBS_DIRS) \ po @@ -88,6 +88,7 @@ sbin_PROGRAMS = usrbin_exec_PROGRAMS = usrbin_exec_SCRIPTS = usrsbin_exec_PROGRAMS = +usrlib_exec_LTLIBRARIES = tests_helpers_test_md5_SOURCES = tests/helpers/test_md5.c tests_helpers_test_md5_LDADD = lib/libcommon.la @@ -104,6 +105,7 @@ include schedutils/module.am include text-utils/module.am include mount/module.am include sys-utils/module.am +include shlibs/blkid/src/module.am clean-local: rm -rf tests/output tests/diff diff --git a/config/include-Makefile.am b/config/include-Makefile.am index e7dbd34..3ce4090 100644 --- a/config/include-Makefile.am +++ b/config/include-Makefile.am @@ -19,10 +19,6 @@ ul_libblkid_la = $(top_builddir)/shlibs/blkid/src/libblkid.la # blkid.h is generated by ./configure script and stored in build directory ul_libblkid_incdir = $(ul_libblkid_builddir) -$(ul_libblkid_la): - $(MAKE) -C $(ul_libblkid_builddir) - - # uuid ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src diff --git a/config/include-sub-Makefile.am b/config/include-sub-Makefile.am new file mode 100644 index 0000000..4a38462 --- /dev/null +++ b/config/include-sub-Makefile.am @@ -0,0 +1,4 @@ +include $(top_srcdir)/config/include-Makefile.am + +$(ul_libblkid_la): + $(MAKE) -C $(top_builddir) $(ul_libblkid_la) diff --git a/configure.ac b/configure.ac index ec36284..f931159 100644 --- a/configure.ac +++ b/configure.ac @@ -1140,11 +1140,7 @@ shlibs/blkid/blkid.pc shlibs/blkid/Makefile shlibs/blkid/docs/Makefile shlibs/blkid/docs/version.xml -shlibs/blkid/src/Makefile shlibs/blkid/src/blkid.h -shlibs/blkid/src/superblocks/Makefile -shlibs/blkid/src/topology/Makefile -shlibs/blkid/src/partitions/Makefile shlibs/blkid/samples/Makefile shlibs/mount/mount.pc shlibs/mount/Makefile diff --git a/shlibs/blkid/Makefile.am b/shlibs/blkid/Makefile.am index 041fa79..8ab033d 100644 --- a/shlibs/blkid/Makefile.am +++ b/shlibs/blkid/Makefile.am @@ -1,6 +1,6 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am -SUBDIRS = src samples +SUBDIRS = samples if ENABLE_GTK_DOC SUBDIRS += docs diff --git a/shlibs/blkid/docs/Makefile.am b/shlibs/blkid/docs/Makefile.am index 8ef3b23..c34d2a5 100644 --- a/shlibs/blkid/docs/Makefile.am +++ b/shlibs/blkid/docs/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am ## Process this file with automake to produce Makefile.in diff --git a/shlibs/blkid/samples/Makefile.am b/shlibs/blkid/samples/Makefile.am index 93588d5..b73da2d 100644 --- a/shlibs/blkid/samples/Makefile.am +++ b/shlibs/blkid/samples/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am AM_CPPFLAGS += -I$(ul_libblkid_incdir) AM_LDFLAGS += $(ul_libblkid_la) diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am deleted file mode 100644 index bb395c7..0000000 --- a/shlibs/blkid/src/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -SUBDIRS = superblocks topology partitions . - -common_ldadd = -common_cflags = - -if HAVE_UUID -if BUILD_LIBUUID -common_ldadd += $(ul_libuuid_la) -common_cflags += -I$(ul_libuuid_srcdir) -else -common_ldadd += $(UUID_LIBS) -common_cflags += $(UUID_CFLAGS) -endif -endif - -AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) $(common_cflags) - -# includes -blkidincdir = $(includedir)/blkid -nodist_blkidinc_HEADERS = blkid.h - -usrlib_exec_LTLIBRARIES = libblkid.la -libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \ - probe.c read.c resolve.c save.c tag.c version.c verify.c \ - encode.c blkidP.h superblocks/superblocks.h \ - config.c evaluate.c fat.h \ - $(blkidinc_HEADERS) \ - $(top_srcdir)/lib/blkdev.c \ - $(top_srcdir)/lib/linux_version.c \ - $(top_srcdir)/lib/canonicalize.c \ - $(top_srcdir)/lib/md5.c \ - $(top_srcdir)/lib/crc32.c \ - $(top_srcdir)/include/list.h - -nodist_libblkid_la_SOURCES = blkid.h - -libblkid_la_LIBADD = superblocks/libblkid_superblocks.la \ - topology/libblkid_topology.la \ - partitions/libblkid_partitions.la \ - $(common_ldadd) - -libblkid_la_DEPENDENCIES = $(libblkid_la_LIBADD) blkid.sym blkid.h.in - -libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \ - -version-info $(LIBBLKID_VERSION_INFO) - -tests = test_cache test_config test_dev test_devname test_devno \ - test_read test_resolve test_save test_tag test_verify test_evaluate - -EXTRA_DIST = blkid.sym tst_types.c blkid.h.in -CLEANFILES = $(tests) - -tests: all $(tests) -test_%: %.c - $(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(UUID_LIBS) - - -# move lib from $(usrlib_execdir) to $(libdir) if needed -install-exec-hook: - if test "$(usrlib_execdir)" != "$(libdir)"; then \ - mkdir -p $(DESTDIR)$(libdir); \ - mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ - so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ - so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ - (cd $(DESTDIR)$(usrlib_execdir) && \ - rm -f libblkid.so && \ - $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \ - fi - -uninstall-hook: - rm -f $(DESTDIR)$(libdir)/libblkid.so* diff --git a/shlibs/blkid/src/module.am b/shlibs/blkid/src/module.am new file mode 100644 index 0000000..f92d0b6 --- /dev/null +++ b/shlibs/blkid/src/module.am @@ -0,0 +1,195 @@ +AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) + +# includes +blkidincdir = $(includedir)/blkid +nodist_blkidinc_HEADERS = shlibs/blkid/src/blkid.h + +shlibs_blkid_src_libblkid_la_SOURCES = shlibs/blkid/src/cache.c \ + shlibs/blkid/src/dev.c shlibs/blkid/src/devname.c \ + shlibs/blkid/src/devno.c shlibs/blkid/src/getsize.c \ + shlibs/blkid/src/llseek.c shlibs/blkid/src/probe.c \ + shlibs/blkid/src/read.c shlibs/blkid/src/resolve.c \ + shlibs/blkid/src/save.c shlibs/blkid/src/tag.c \ + shlibs/blkid/src/version.c shlibs/blkid/src/verify.c \ + shlibs/blkid/src/encode.c shlibs/blkid/src/blkidP.h \ + shlibs/blkid/src/config.c shlibs/blkid/src/evaluate.c \ + shlibs/blkid/src/fat.h \ + shlibs/blkid/src/superblocks/superblocks.h \ + shlibs/blkid/src/superblocks/superblocks.c \ + shlibs/blkid/src/superblocks/cramfs.c \ + shlibs/blkid/src/superblocks/swap.c \ + shlibs/blkid/src/superblocks/adaptec_raid.c \ + shlibs/blkid/src/superblocks/ddf_raid.c \ + shlibs/blkid/src/superblocks/isw_raid.c \ + shlibs/blkid/src/superblocks/jmicron_raid.c \ + shlibs/blkid/src/superblocks/lsi_raid.c \ + shlibs/blkid/src/superblocks/nvidia_raid.c \ + shlibs/blkid/src/superblocks/promise_raid.c \ + shlibs/blkid/src/superblocks/silicon_raid.c \ + shlibs/blkid/src/superblocks/via_raid.c \ + shlibs/blkid/src/superblocks/linux_raid.c \ + shlibs/blkid/src/superblocks/jfs.c \ + shlibs/blkid/src/superblocks/xfs.c \ + shlibs/blkid/src/superblocks/ext.c \ + shlibs/blkid/src/superblocks/gfs.c \ + shlibs/blkid/src/superblocks/ocfs.c \ + shlibs/blkid/src/superblocks/reiserfs.c \ + shlibs/blkid/src/superblocks/romfs.c \ + shlibs/blkid/src/superblocks/ntfs.c \ + shlibs/blkid/src/superblocks/hfs.c \ + shlibs/blkid/src/superblocks/iso9660.c \ + shlibs/blkid/src/superblocks/udf.c \ + shlibs/blkid/src/superblocks/vfat.c \ + shlibs/blkid/src/superblocks/luks.c \ + shlibs/blkid/src/superblocks/highpoint_raid.c \ + shlibs/blkid/src/superblocks/vxfs.c \ + shlibs/blkid/src/superblocks/minix.c \ + shlibs/blkid/src/superblocks/ufs.c \ + shlibs/blkid/src/superblocks/hpfs.c \ + shlibs/blkid/src/superblocks/squashfs.c \ + shlibs/blkid/src/superblocks/netware.c \ + shlibs/blkid/src/superblocks/sysv.c \ + shlibs/blkid/src/superblocks/btrfs.c \ + shlibs/blkid/src/superblocks/lvm.c \ + shlibs/blkid/src/superblocks/zfs.c \ + shlibs/blkid/src/superblocks/ubifs.c \ + shlibs/blkid/src/superblocks/bfs.c \ + shlibs/blkid/src/superblocks/drbd.c \ + shlibs/blkid/src/superblocks/vmfs.c \ + shlibs/blkid/src/superblocks/befs.c \ + shlibs/blkid/src/superblocks/exfat.c \ + shlibs/blkid/src/topology/topology.c \ + shlibs/blkid/src/topology/topology.h \ + shlibs/blkid/src/topology/ioctl.c \ + shlibs/blkid/src/topology/sysfs.c \ + shlibs/blkid/src/topology/md.c \ + shlibs/blkid/src/topology/dm.c \ + shlibs/blkid/src/topology/evms.c \ + shlibs/blkid/src/topology/lvm.c \ + shlibs/blkid/src/partitions/partitions.c \ + shlibs/blkid/src/partitions/partitions.h \ + shlibs/blkid/src/partitions/blkid_parttypes.h \ + shlibs/blkid/src/partitions/aix.c \ + shlibs/blkid/src/partitions/aix.h \ + shlibs/blkid/src/partitions/bsd.c \ + shlibs/blkid/src/partitions/unixware.c \ + shlibs/blkid/src/partitions/solaris_x86.c \ + shlibs/blkid/src/partitions/sun.c \ + shlibs/blkid/src/partitions/sgi.c \ + shlibs/blkid/src/partitions/mac.c \ + shlibs/blkid/src/partitions/dos.c \ + shlibs/blkid/src/partitions/dos.h \ + shlibs/blkid/src/partitions/minix.c \ + shlibs/blkid/src/partitions/ultrix.c \ + shlibs/blkid/src/partitions/gpt.c \ + $(blkidinc_HEADERS) \ + lib/canonicalize.c lib/crc32.c include/list.h + +nodist_shlibs_blkid_src_libblkid_la_SOURCES = shlibs/blkid/src/blkid.h + +shlibs_blkid_src_libblkid_la_LIBADD = lib/libcommon.la +shlibs_blkid_src_libblkid_la_DEPENDENCIES = \ + $(shlibs_blkid_src_libblkid_la_LIBADD) \ + shlibs/blkid/src/blkid.sym shlibs/blkid/src/blkid.h.in + +shlibs_blkid_src_libblkid_la_LDFLAGS = -Wl,--version-script=$(ul_libblkid_srcdir)/blkid.sym \ + -version-info $(LIBBLKID_VERSION_INFO) + +EXTRA_DIST += shlibs/blkid/src/blkid.sym shlibs/blkid/src/tst_types.c \ + shlibs/blkid/src/blkid.h.in + +if HAVE_UUID +if BUILD_LIBUUID +shlibs_blkid_src_libblkid_la_LIBADD += $(ul_libuuid_la) +AM_CPPFLAGS += -I$(ul_libuuid_srcdir) +else +shlibs_blkid_src_libblkid_la_LIBADD += $(UUID_LIBS) +AM_CPPFLAGS += $(UUID_CFLAGS) +endif +endif + +LIBBLKID_TESTS_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_PROGRAM + +shlibs_blkid_src_test_cache_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_cache_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_cache_LDFLAGS = -static +shlibs_blkid_src_test_cache_SOURCES = shlibs/blkid/src/cache.c + +shlibs_blkid_src_test_config_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_config_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_config_LDFLAGS = -static +shlibs_blkid_src_test_config_SOURCES = shlibs/blkid/src/config.c + +shlibs_blkid_src_test_dev_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_dev_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_dev_LDFLAGS = -static +shlibs_blkid_src_test_dev_SOURCES = shlibs/blkid/src/dev.c + +shlibs_blkid_src_test_devname_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_devname_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_devname_LDFLAGS = -static +shlibs_blkid_src_test_devname_SOURCES = shlibs/blkid/src/devname.c + +shlibs_blkid_src_test_devno_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_devno_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_devno_LDFLAGS = -static +shlibs_blkid_src_test_devno_SOURCES = shlibs/blkid/src/devno.c + +shlibs_blkid_src_test_evaluate_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_evaluate_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_evaluate_LDFLAGS = -static +shlibs_blkid_src_test_evaluate_SOURCES = shlibs/blkid/src/evaluate.c + +shlibs_blkid_src_test_read_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_read_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_read_LDFLAGS = -static +shlibs_blkid_src_test_read_SOURCES = shlibs/blkid/src/read.c + +shlibs_blkid_src_test_resolve_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_resolve_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_resolve_LDFLAGS = -static +shlibs_blkid_src_test_resolve_SOURCES = shlibs/blkid/src/resolve.c + +shlibs_blkid_src_test_save_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_save_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_save_LDFLAGS = -static +shlibs_blkid_src_test_save_SOURCES = shlibs/blkid/src/save.c + +shlibs_blkid_src_test_tag_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_tag_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_tag_LDFLAGS = -static +shlibs_blkid_src_test_tag_SOURCES = shlibs/blkid/src/tag.c + +shlibs_blkid_src_test_verify_CPPFLAGS = $(LIBBLKID_TESTS_CPPFLAGS) +shlibs_blkid_src_test_verify_LDADD = shlibs/blkid/src/libblkid.la $(UUID_LIBS) +shlibs_blkid_src_test_verify_LDFLAGS = -static +shlibs_blkid_src_test_verify_SOURCES = shlibs/blkid/src/verify.c + +if BUILD_LIBBLKID +usrlib_exec_LTLIBRARIES += shlibs/blkid/src/libblkid.la + +check_PROGRAMS += shlibs/blkid/src/test_cache \ + shlibs/blkid/src/test_config shlibs/blkid/src/test_dev \ + shlibs/blkid/src/test_devname shlibs/blkid/src/test_devno \ + shlibs/blkid/src/test_read shlibs/blkid/src/test_resolve \ + shlibs/blkid/src/test_save shlibs/blkid/src/test_tag \ + shlibs/blkid/src/test_verify shlibs/blkid/src/test_evaluate + +# move lib from $(usrlib_execdir) to $(libdir) if needed +install-exec-hook-libblkid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ + so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ + so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ + (cd $(DESTDIR)$(usrlib_execdir) && \ + rm -f libblkid.so && \ + $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \ + fi + +uninstall-hook-libblkid: + rm -f $(DESTDIR)$(libdir)/libblkid.so* + +INSTALL_EXEC_HOOKS += install-exec-hook-libblkid +UNINSTALL_HOOKS += uninstall-hook-libblkid +endif # BUILD_LIBBLKID diff --git a/shlibs/blkid/src/partitions/Makefile.am b/shlibs/blkid/src/partitions/Makefile.am deleted file mode 100644 index f617389..0000000 --- a/shlibs/blkid/src/partitions/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) -libblkid_partitions_la_LIBADD = - -noinst_LTLIBRARIES = libblkid_partitions.la -libblkid_partitions_la_SOURCES = partitions.c \ - partitions.h \ - blkid_parttypes.h \ - aix.c \ - aix.h \ - bsd.c \ - unixware.c \ - solaris_x86.c \ - sun.c \ - sgi.c \ - mac.c \ - dos.c \ - dos.h \ - minix.c \ - ultrix.c \ - gpt.c diff --git a/shlibs/blkid/src/superblocks/Makefile.am b/shlibs/blkid/src/superblocks/Makefile.am deleted file mode 100644 index 39b074b..0000000 --- a/shlibs/blkid/src/superblocks/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) - -noinst_LTLIBRARIES = libblkid_superblocks.la -libblkid_superblocks_la_SOURCES = \ - superblocks.h \ - superblocks.c \ - cramfs.c \ - swap.c \ - adaptec_raid.c \ - ddf_raid.c \ - isw_raid.c \ - jmicron_raid.c \ - lsi_raid.c \ - nvidia_raid.c \ - promise_raid.c \ - silicon_raid.c \ - via_raid.c \ - linux_raid.c \ - jfs.c \ - xfs.c \ - ext.c \ - gfs.c \ - ocfs.c \ - reiserfs.c \ - romfs.c \ - ntfs.c \ - hfs.c \ - iso9660.c \ - udf.c \ - vfat.c \ - luks.c \ - highpoint_raid.c \ - vxfs.c \ - minix.c \ - ufs.c \ - hpfs.c \ - squashfs.c \ - netware.c \ - sysv.c \ - btrfs.c \ - lvm.c \ - zfs.c \ - ubifs.c \ - bfs.c \ - drbd.c \ - vmfs.c \ - befs.c \ - exfat.c diff --git a/shlibs/blkid/src/topology/Makefile.am b/shlibs/blkid/src/topology/Makefile.am deleted file mode 100644 index 11c348b..0000000 --- a/shlibs/blkid/src/topology/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -AM_CPPFLAGS += -I$(ul_libblkid_incdir) -I$(ul_libblkid_srcdir) -libblkid_topology_la_LIBADD = - -noinst_LTLIBRARIES = libblkid_topology.la -libblkid_topology_la_SOURCES = topology.c \ - topology.h \ - ioctl.c \ - sysfs.c \ - md.c \ - dm.c \ - evms.c \ - lvm.c diff --git a/shlibs/mount/Makefile.am b/shlibs/mount/Makefile.am index 5f7ca4c..33e082f 100644 --- a/shlibs/mount/Makefile.am +++ b/shlibs/mount/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am SUBDIRS = src diff --git a/shlibs/mount/docs/Makefile.am b/shlibs/mount/docs/Makefile.am index 13e1c65..0b1e5c5 100644 --- a/shlibs/mount/docs/Makefile.am +++ b/shlibs/mount/docs/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am ## Process this file with automake to produce Makefile.in diff --git a/shlibs/mount/src/Makefile.am b/shlibs/mount/src/Makefile.am index aebd3cc..78a946d 100644 --- a/shlibs/mount/src/Makefile.am +++ b/shlibs/mount/src/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am AM_CPPFLAGS += -I$(ul_libmount_incdir) \ -I$(ul_libmount_srcdir) \ diff --git a/shlibs/uuid/Makefile.am b/shlibs/uuid/Makefile.am index 2bdef33..9559360 100644 --- a/shlibs/uuid/Makefile.am +++ b/shlibs/uuid/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am SUBDIRS = src man diff --git a/shlibs/uuid/man/Makefile.am b/shlibs/uuid/man/Makefile.am index 3880952..e6a74d4 100644 --- a/shlibs/uuid/man/Makefile.am +++ b/shlibs/uuid/man/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am dist_man_MANS = uuid.3 uuid_clear.3 uuid_compare.3 uuid_copy.3 uuid_generate.3 \ uuid_is_null.3 uuid_parse.3 uuid_time.3 uuid_unparse.3 diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am index 9af1979..b994891 100644 --- a/shlibs/uuid/src/Makefile.am +++ b/shlibs/uuid/src/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/config/include-Makefile.am +include $(top_srcdir)/config/include-sub-Makefile.am AM_CPPFLAGS += -I$(ul_libuuid_srcdir) -- 1.7.1.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
