This reduces the need to recurse inside samples/ and inside blkid/ itself; if the gtk-doc is enabled, that will still be recursive though. Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 11 +- configure.ac | 2 - shlibs/blkid/Makefile.am | 16 --- shlibs/blkid/module.am | 221 ++++++++++++++++++++++++++++++++++++++ shlibs/blkid/samples/Makefile.am | 7 -- shlibs/blkid/src/module.am | 195 --------------------------------- 6 files changed, 227 insertions(+), 225 deletions(-) delete mode 100644 shlibs/blkid/Makefile.am create mode 100644 shlibs/blkid/module.am delete mode 100644 shlibs/blkid/samples/Makefile.am delete mode 100644 shlibs/blkid/src/module.am diff --git a/Makefile.am b/Makefile.am index ff6e4b4..a7b6a1c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,10 +39,6 @@ if BUILD_LIBUUID SHLIBS_DIRS += shlibs/uuid endif -if BUILD_LIBBLKID -SHLIBS_DIRS += shlibs/blkid -endif - if BUILD_LIBMOUNT SHLIBS_DIRS += shlibs/mount endif @@ -72,6 +68,9 @@ EXTRA_DIST = \ tools \ docs +pkgconfigdir = $(usrlib_execdir)/pkgconfig +pkgconfig_DATA = + CLEANFILES = dist_man_MANS = @@ -90,6 +89,8 @@ usrbin_exec_SCRIPTS = usrsbin_exec_PROGRAMS = usrlib_exec_LTLIBRARIES = +EXTRA_PROGRAMS = + tests_helpers_test_md5_SOURCES = tests/helpers/test_md5.c tests_helpers_test_md5_LDADD = lib/libcommon.la @@ -105,7 +106,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 +include shlibs/blkid/module.am include shlibs/mount/src/module.am include shlibs/uuid/src/module.am diff --git a/configure.ac b/configure.ac index 9288fd0..5ae4e2e 100644 --- a/configure.ac +++ b/configure.ac @@ -1137,11 +1137,9 @@ Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl po/Makefile.in shlibs/blkid/blkid.pc -shlibs/blkid/Makefile shlibs/blkid/docs/Makefile shlibs/blkid/docs/version.xml shlibs/blkid/src/blkid.h -shlibs/blkid/samples/Makefile shlibs/mount/mount.pc shlibs/mount/Makefile shlibs/mount/src/mount.h diff --git a/shlibs/blkid/Makefile.am b/shlibs/blkid/Makefile.am deleted file mode 100644 index 8ab033d..0000000 --- a/shlibs/blkid/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -include $(top_srcdir)/config/include-sub-Makefile.am - -SUBDIRS = samples - -if ENABLE_GTK_DOC -SUBDIRS += docs -endif - -# pkg-config stuff -pkgconfigdir = $(usrlib_execdir)/pkgconfig -pkgconfig_DATA = blkid.pc - -dist_man_MANS = libblkid.3 - -EXTRA_DIST = README.blkid blkid.pc.in libblkid.3 - diff --git a/shlibs/blkid/module.am b/shlibs/blkid/module.am new file mode 100644 index 0000000..3ea3234 --- /dev/null +++ b/shlibs/blkid/module.am @@ -0,0 +1,221 @@ +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 + +shlibs_blkid_samples_mkfs_CPPFLAGS = -I shlibs/blkid/src +shlibs_blkid_samples_mkfs_LDADD = shlibs/blkid/src/libblkid.la + +shlibs_blkid_samples_partitions_CPPFLAGS = -I shlibs/blkid/src +shlibs_blkid_samples_partitions_LDADD = shlibs/blkid/src/libblkid.la + +shlibs_blkid_samples_superblocks_CPPFLAGS = -I shlibs/blkid/src +shlibs_blkid_samples_superblocks_LDADD = shlibs/blkid/src/libblkid.la + +shlibs_blkid_samples_topology_CPPFLAGS = -I shlibs/blkid/src +shlibs_blkid_samples_topology_LDADD = shlibs/blkid/src/libblkid.la + +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 + +EXTRA_PROGRAMS += shlibs/blkid/samples/topology \ + shlibs/blkid/samples/partitions shlibs/blkid/samples/mkfs \ + shlibs/blkid/samples/superblocks + +pkgconfig_DATA += shlibs/blkid/blkid.pc + +dist_man_MANS += shlibs/blkid/libblkid.3 + +EXTRA_DIST += shlibs/blkid/README.blkid + +if ENABLE_GTK_DOC +SUBDIRS += shlibs/blkid/docs +endif + +# 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/samples/Makefile.am b/shlibs/blkid/samples/Makefile.am deleted file mode 100644 index b73da2d..0000000 --- a/shlibs/blkid/samples/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include $(top_srcdir)/config/include-sub-Makefile.am - -AM_CPPFLAGS += -I$(ul_libblkid_incdir) -AM_LDFLAGS += $(ul_libblkid_la) - -noinst_PROGRAMS = topology partitions mkfs superblocks - diff --git a/shlibs/blkid/src/module.am b/shlibs/blkid/src/module.am deleted file mode 100644 index f92d0b6..0000000 --- a/shlibs/blkid/src/module.am +++ /dev/null @@ -1,195 +0,0 @@ -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 -- 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
