build-sys: convert libuuid/ to module

Signed-off-by: Karel Zak <kzak@redhat.com>

11 files changed, 102 insertions, 190 deletions

diff --git a/Makefile.am b/Makefile.am
index 8e9171a61..cc23b7a76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,23 @@
 include $(top_srcdir)/config/include-Makefile.am
 
+pkgconfigdir = $(usrlib_execdir)/pkgconfig
+
 dist_noinst_HEADERS =
 noinst_PROGRAMS =
 usrbin_exec_PROGRAMS =
 dist_man_MANS =
+man_MANS =
+pkgconfig_DATA =
+usrlib_exec_LTLIBRARIES =
 
-SHLIBS_DIRS =
+INSTALL_EXEC_HOOKS =
+UNINSTALL_HOOKS =
 
-if BUILD_LIBUUID
-SHLIBS_DIRS += libuuid
-endif
+EXTRA_DIST =
+CLEANFILES =
+
+
+SHLIBS_DIRS =
 
 if BUILD_LIBBLKID
 SHLIBS_DIRS += libblkid
@@ -55,7 +63,7 @@ endif
 AUTOMAKE_OPTIONS = gnu
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	.version \
 	autogen.sh \
 	Documentation \
@@ -66,6 +74,7 @@ EXTRA_DIST = \
 include include/Makemodule.am
 include lib/Makemodule.am
 include schedutils/Makemodule.am
+include libuuid/Makemodule.am
 
 
 # Arrange so that .tarball-version appears only in the distribution
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 4983b3c19..9f87e1eaa 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -28,11 +28,7 @@ $(ul_libblkid_la):
 # uuid
 ul_libuuid_srcdir = $(top_srcdir)/libuuid/src
 ul_libuuid_builddir = $(top_builddir)/libuuid/src
-ul_libuuid_la = $(top_builddir)/libuuid/src/libuuid.la
-
-$(ul_libuuid_la):
-	$(MAKE) -C $(ul_libuuid_builddir)
-
+ul_libuuid_la = libuuid.la
 
 # mount
 ul_libmount_srcdir = $(top_srcdir)/libmount/src
diff --git a/configure.ac b/configure.ac
index 0b659f227..2636121bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1320,9 +1320,6 @@ libmount/docs/version.xml
 libmount/mount.pc
 libmount/src/Makefile
 libmount/src/libmount.h
-libuuid/Makefile
-libuuid/man/Makefile
-libuuid/src/Makefile
 libuuid/uuid.pc
 login-utils/Makefile
 man/ru/Makefile
diff --git a/libuuid/Makefile.am b/libuuid/Makefile.am
deleted file mode 100644
index d7c50ba49..000000000
--- a/libuuid/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-SUBDIRS = src man
-
-# pkg-config stuff
-pkgconfigdir = $(usrlib_execdir)/pkgconfig
-pkgconfig_DATA = uuid.pc
-
-EXTRA_DIST = uuid.pc.in
diff --git a/libuuid/Makemodule.am b/libuuid/Makemodule.am
new file mode 100644
index 000000000..e2db4ff76
--- /dev/null
+++ b/libuuid/Makemodule.am
@@ -0,0 +1,9 @@
+if BUILD_LIBUUID
+
+include libuuid/man/Makemodule.am
+include libuuid/src/Makemodule.am
+
+pkgconfig_DATA += libuuid/uuid.pc
+EXTRA_DIST     += libuuid/uuid.pc.in
+
+endif # BUILD_LIBUUID
diff --git a/libuuid/man/Makefile.am b/libuuid/man/Makefile.am
deleted file mode 100644
index ab4a8ebff..000000000
--- a/libuuid/man/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-include $(top_srcdir)/config/include-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 \
-	uuid_generate_time_safe.3
-
-man_MANS = $(UUID_GENERATE_LINKS)
-CLEANFILES = $(man_MANS)
-
-$(UUID_GENERATE_LINKS):
-	$(AM_V_GEN)echo ".so man3/uuid_generate.3" > $@
diff --git a/libuuid/man/Makemodule.am b/libuuid/man/Makemodule.am
new file mode 100644
index 000000000..9824fbc69
--- /dev/null
+++ b/libuuid/man/Makemodule.am
@@ -0,0 +1,22 @@
+
+dist_man_MANS += \
+	libuuid/man/uuid.3 \
+	libuuid/man/uuid_clear.3 \
+	libuuid/man/uuid_compare.3 \
+	libuuid/man/uuid_copy.3 \
+	libuuid/man/uuid_generate.3 \
+	libuuid/man/uuid_is_null.3 \
+	libuuid/man/uuid_parse.3 \
+	libuuid/man/uuid_time.3 \
+	libuuid/man/uuid_unparse.3
+
+UUID_GENERATE_LINKS = \
+	libuuid/man/uuid_generate_random.3 \
+	libuuid/man/uuid_generate_time.3 \
+	libuuid/man/uuid_generate_time_safe.3
+
+man_MANS += $(UUID_GENERATE_LINKS)
+CLEANFILES += $(man_MANS)
+
+$(UUID_GENERATE_LINKS):
+	$(AM_V_GEN)echo ".so man3/uuid_generate.3" > $@
diff --git a/libuuid/src/Makefile.am b/libuuid/src/Makefile.am
deleted file mode 100644
index 8e872100b..000000000
--- a/libuuid/src/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-include $(top_srcdir)/config/include-Makefile.am
-
-AM_CPPFLAGS += -I$(ul_libuuid_srcdir)
-
-noinst_PROGRAMS = tst_uuid
-tst_uuid_LDADD = libuuid.la $(SOCKET_LIBS) #$(ul_libuuid_la)
-
-# includes
-uuidincdir = $(includedir)/uuid
-uuidinc_HEADERS = uuid.h
-
-usrlib_exec_LTLIBRARIES = libuuid.la
-
-libuuid_la_SOURCES = \
-	clear.c \
-	compare.c \
-	copy.c \
-	gen_uuid.c \
-	isnull.c \
-	pack.c \
-	parse.c \
-	unpack.c \
-	unparse.c \
-	uuidd.h \
-	uuidd.h \
-	uuidP.h \
-	uuid_time.c \
-	$(uuidinc_HEADERS) \
-	$(top_srcdir)/lib/randutils.c
-
-libuuid_la_DEPENDENCIES = uuid.sym
-
-libuuid_la_LIBADD = $(SOCKET_LIBS)
-
-libuuid_la_LDFLAGS = -Wl,--version-script=$(ul_libuuid_srcdir)/uuid.sym \
-		     -version-info $(LIBUUID_VERSION_INFO)
-
-EXTRA_DIST = uuid.sym gen_uuid_nt.c
-
-# 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)/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:
-	rm -f $(DESTDIR)$(libdir)/libuuid.so*
diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
new file mode 100644
index 000000000..2332fe24f
--- /dev/null
+++ b/libuuid/src/Makemodule.am
@@ -0,0 +1,56 @@
+
+noinst_PROGRAMS += test_uuid
+test_uuid_SOURCES = libuuid/src/test_uuid.c
+test_uuid_LDADD = libuuid.la $(SOCKET_LIBS)
+test_uuid_CFLAGS = -I$(ul_libuuid_incdir)
+
+# includes
+uuidincdir = $(includedir)/uuid
+uuidinc_HEADERS = libuuid/src/uuid.h
+
+usrlib_exec_LTLIBRARIES += libuuid.la
+
+libuuid_la_SOURCES = \
+	libuuid/src/clear.c \
+	libuuid/src/compare.c \
+	libuuid/src/copy.c \
+	libuuid/src/gen_uuid.c \
+	libuuid/src/isnull.c \
+	libuuid/src/pack.c \
+	libuuid/src/parse.c \
+	libuuid/src/unpack.c \
+	libuuid/src/unparse.c \
+	libuuid/src/uuidd.h \
+	libuuid/src/uuidd.h \
+	libuuid/src/uuidP.h \
+	libuuid/src/uuid_time.c \
+	$(uuidinc_HEADERS) \
+	lib/randutils.c
+
+libuuid_la_DEPENDENCIES = libuuid/src/uuid.sym
+libuuid_la_LIBADD       = $(SOCKET_LIBS)
+libuuid_la_CFLAGS       = -I$(ul_libuuid_incdir) -Ilibuuid/src
+
+libuuid_la_LDFLAGS = \
+	-Wl,--version-script=$(top_srcdir)/libuuid/src/uuid.sym \
+	-version-info $(LIBUUID_VERSION_INFO)
+
+EXTRA_DIST += libuuid/src/uuid.sym
+
+# 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
diff --git a/libuuid/src/gen_uuid_nt.c b/libuuid/src/gen_uuid_nt.c
deleted file mode 100644
index aa44bfd3d..000000000
--- a/libuuid/src/gen_uuid_nt.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * gen_uuid_nt.c -- Use NT api to generate uuid
- *
- * Written by Andrey Shedel (andreys@ns.cr.cyco.com)
- */
-
-
-#include "uuidP.h"
-
-#pragma warning(push,4)
-
-#pragma comment(lib, "ntdll.lib")
-
-//
-// Here is a nice example why it's not a good idea
-// to use native API in ordinary applications.
-// Number of parameters in function below was changed from 3 to 4
-// for NT5.
-//
-//
-// NTSYSAPI
-// NTSTATUS
-// NTAPI
-// NtAllocateUuids(
-//     OUT PULONG p1,
-//     OUT PULONG p2,
-//     OUT PULONG p3,
-//     OUT PUCHAR Seed // 6 bytes
-//   );
-//
-//
-
-unsigned long
-__stdcall
-NtAllocateUuids(
-   void* p1,  // 8 bytes
-   void* p2,  // 4 bytes
-   void* p3   // 4 bytes
-   );
-
-typedef
-unsigned long
-(__stdcall*
-NtAllocateUuids_2000)(
-   void* p1,  // 8 bytes
-   void* p2,  // 4 bytes
-   void* p3,  // 4 bytes
-   void* seed // 6 bytes
-   );
-
-
-
-//
-// Nice, but instead of including ntddk.h ot winnt.h
-// I should define it here because they MISSED __stdcall in those headers.
-//
-
-__declspec(dllimport)
-struct _TEB*
-__stdcall
-NtCurrentTeb(void);
-
-
-//
-// The only way to get version information from the system is to examine
-// one stored in PEB. But it's pretty dangerouse because this value could
-// be altered in image header.
-//
-
-static
-int
-Nt5(void)
-{
-	//return NtCuttentTeb()->Peb->OSMajorVersion >= 5;
-	return (int)*(int*)((char*)(int)(*(int*)((char*)NtCurrentTeb() + 0x30)) + 0xA4) >= 5;
-}
-
-
-
-
-void uuid_generate(uuid_t out)
-{
-	if(Nt5())
-	{
-		unsigned char seed[6];
-		((NtAllocateUuids_2000)NtAllocateUuids)(out, ((char*)out)+8, ((char*)out)+12, &seed[0] );
-	}
-	else
-	{
-		NtAllocateUuids(out, ((char*)out)+8, ((char*)out)+12);
-	}
-}
diff --git a/libuuid/src/tst_uuid.c b/libuuid/src/test_uuid.c
index e03138f7d..e03138f7d 100644
--- a/libuuid/src/tst_uuid.c
+++ b/libuuid/src/test_uuid.c