Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 12 +------ configure.ac | 2 - shlibs/uuid/Makefile.am | 10 ------ shlibs/uuid/man/Makefile.am | 12 ------- shlibs/uuid/module.am | 68 +++++++++++++++++++++++++++++++++++++++++++ shlibs/uuid/src/module.am | 48 ------------------------------ 6 files changed, 70 insertions(+), 82 deletions(-) delete mode 100644 shlibs/uuid/Makefile.am delete mode 100644 shlibs/uuid/man/Makefile.am create mode 100644 shlibs/uuid/module.am delete mode 100644 shlibs/uuid/src/module.am diff --git a/Makefile.am b/Makefile.am index 5107b35..c6734f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,15 +33,7 @@ noinst_HEADERS = \ include/writeall.h \ include/xstrncpy.h -SHLIBS_DIRS = - -if BUILD_LIBUUID -SHLIBS_DIRS += shlibs/uuid -endif - -SUBDIRS = . \ - $(SHLIBS_DIRS) \ - po +SUBDIRS = po RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o @@ -104,7 +96,7 @@ include mount/module.am include sys-utils/module.am include shlibs/blkid/module.am include shlibs/mount/module.am -include shlibs/uuid/src/module.am +include shlibs/uuid/module.am clean-local: rm -rf tests/output tests/diff diff --git a/configure.ac b/configure.ac index b2c1f92..e98538f 100644 --- a/configure.ac +++ b/configure.ac @@ -1145,8 +1145,6 @@ shlibs/mount/src/mount.h shlibs/mount/docs/Makefile shlibs/mount/docs/version.xml shlibs/uuid/uuid.pc -shlibs/uuid/Makefile -shlibs/uuid/man/Makefile tests/commands.sh ]) diff --git a/shlibs/uuid/Makefile.am b/shlibs/uuid/Makefile.am deleted file mode 100644 index 73c1a26..0000000 --- a/shlibs/uuid/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/config/include-sub-Makefile.am - -SUBDIRS = man - -# pkg-config stuff -pkgconfigdir = $(usrlib_execdir)/pkgconfig -pkgconfig_DATA = uuid.pc - -EXTRA_DIST = uuid.pc.in - diff --git a/shlibs/uuid/man/Makefile.am b/shlibs/uuid/man/Makefile.am deleted file mode 100644 index e6a74d4..0000000 --- a/shlibs/uuid/man/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -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 - -UUID_GENERATE_LINKS = uuid_generate_random.3 uuid_generate_time.3 - -man_MANS = $(UUID_GENERATE_LINKS) -CLEANFILES = $(man_MANS) - -$(UUID_GENERATE_LINKS): - $(AM_V_GEN)echo ".so man3/uuid_generate.3" > $@ diff --git a/shlibs/uuid/module.am b/shlibs/uuid/module.am new file mode 100644 index 0000000..6354304 --- /dev/null +++ b/shlibs/uuid/module.am @@ -0,0 +1,68 @@ +AM_CPPFLAGS += -I$(ul_libuuid_srcdir) + +shlibs_uuid_src_tst_uuid_LDADD = shlibs/uuid/src/libuuid.la +shlibs_uuid_src_tst_uuid_LDFLAGS = -static + +# includes +uuidincdir = $(includedir)/uuid +uuidinc_HEADERS = shlibs/uuid/src/uuid.h + +shlibs_uuid_src_libuuid_la_SOURCES = shlibs/uuid/src/clear.c \ + shlibs/uuid/src/compare.c shlibs/uuid/src/copy.c \ + shlibs/uuid/src/gen_uuid.c shlibs/uuid/src/isnull.c \ + shlibs/uuid/src/pack.c shlibs/uuid/src/parse.c \ + shlibs/uuid/src/unpack.c shlibs/uuid/src/unparse.c \ + shlibs/uuid/src/uuidd.h shlibs/uuid/src/uuidd.h \ + shlibs/uuid/src/uuidP.h shlibs/uuid/src/uuid_time.c \ + $(uuidinc_HEADERS) + +shlibs_uuid_src_libuuid_la_DEPENDENCIES = shlibs/uuid/src/uuid.sym + +shlibs_uuid_src_libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \ + -version-info $(LIBUUID_VERSION_INFO) + +EXTRA_DIST += shlibs/uuid/src/uuid.sym shlibs/uuid/src/gen_uuid_nt.c + +if BUILD_LIBUUID +usrlib_exec_LTLIBRARIES += shlibs/uuid/src/libuuid.la +check_PROGRAMS += shlibs/uuid/src/tst_uuid + +pkgconfig_DATA += shlibs/uuid/uuid.pc + +dist_man_MANS += shlibs/uuid/man/uuid.3 shlibs/uuid/man/uuid_clear.3 \ + shlibs/uuid/man/uuid_compare.3 \ + shlibs/uuid/man/uuid_copy.3 \ + shlibs/uuid/man/uuid_generate.3 \ + shlibs/uuid/man/uuid_is_null.3 \ + shlibs/uuid/man/uuid_parse.3 \ + shlibs/uuid/man/uuid_time.3 \ + shlibs/uuid/man/uuid_unparse.3 + +UUID_GENERATE_LINKS = shlibs/uuid/man/uuid_generate_random.3 shlibs/uuid/man/uuid_generate_time.3 + +man_MANS += $(UUID_GENERATE_LINKS) +CLEANFILES += $(UUID_GENERATE_LINKS) + +$(UUID_GENERATE_LINKS): + @$(mkdir_p) shlibs/uuid/man + $(AM_V_GEN)echo ".so man3/uuid_generate.3" > $@ + +# move lib from $(usrlib_execdir) to $(libdir) if needed +install-exec-hook-libuuid: + if test "$(usrlib_execdir)" != "$(libdir)"; then \ + mkdir -p $(DESTDIR)$(libdir); \ + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ + so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ + so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ + (cd $(DESTDIR)$(usrlib_execdir) && \ + rm -f libuuid.so && \ + $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \ + fi + +uninstall-hook-libuuid: + rm -f $(DESTDIR)$(libdir)/libuuid.so* + +INSTALL_EXEC_HOOKS += install-exec-hook-libuuid +UNINSTALL_HOOKS += uninstall-hook-libuuid + +endif diff --git a/shlibs/uuid/src/module.am b/shlibs/uuid/src/module.am deleted file mode 100644 index 12375fe..0000000 --- a/shlibs/uuid/src/module.am +++ /dev/null @@ -1,48 +0,0 @@ -AM_CPPFLAGS += -I$(ul_libuuid_srcdir) - -shlibs_uuid_src_tst_uuid_LDADD = shlibs/uuid/src/libuuid.la -shlibs_uuid_src_tst_uuid_LDFLAGS = -static - -# includes -uuidincdir = $(includedir)/uuid -uuidinc_HEADERS = shlibs/uuid/src/uuid.h - -shlibs_uuid_src_libuuid_la_SOURCES = shlibs/uuid/src/clear.c \ - shlibs/uuid/src/compare.c shlibs/uuid/src/copy.c \ - shlibs/uuid/src/gen_uuid.c shlibs/uuid/src/isnull.c \ - shlibs/uuid/src/pack.c shlibs/uuid/src/parse.c \ - shlibs/uuid/src/unpack.c shlibs/uuid/src/unparse.c \ - shlibs/uuid/src/uuidd.h shlibs/uuid/src/uuidd.h \ - shlibs/uuid/src/uuidP.h shlibs/uuid/src/uuid_time.c \ - $(uuidinc_HEADERS) - -shlibs_uuid_src_libuuid_la_DEPENDENCIES = shlibs/uuid/src/uuid.sym - -shlibs_uuid_src_libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \ - -version-info $(LIBUUID_VERSION_INFO) - -EXTRA_DIST += shlibs/uuid/src/uuid.sym shlibs/uuid/src/gen_uuid_nt.c - -if BUILD_LIBUUID -usrlib_exec_LTLIBRARIES += shlibs/uuid/src/libuuid.la -check_PROGRAMS += shlibs/uuid/src/tst_uuid - -# move lib from $(usrlib_execdir) to $(libdir) if needed -install-exec-hook-libuuid: - if test "$(usrlib_execdir)" != "$(libdir)"; then \ - mkdir -p $(DESTDIR)$(libdir); \ - mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ - so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ - so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ - (cd $(DESTDIR)$(usrlib_execdir) && \ - rm -f libuuid.so && \ - $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \ - fi - -uninstall-hook-libuuid: - rm -f $(DESTDIR)$(libdir)/libuuid.so* - -INSTALL_EXEC_HOOKS += install-exec-hook-libuuid -UNINSTALL_HOOKS += uninstall-hook-libuuid - -endif -- 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
