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
AUTOMAKE_OPTIONS = gnu
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = \
+EXTRA_DIST += \
.version \
autogen.sh \
Documentation \
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
# 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
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
+++ /dev/null
-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
--- /dev/null
+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
+++ /dev/null
-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" > $@
--- /dev/null
+
+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" > $@
+++ /dev/null
-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*
--- /dev/null
+
+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
+++ /dev/null
-/*
- * 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);
- }
-}
projects / thirdparty / util-linux.git / commitdiff
