openbsd-ports/sysutils/e2fsprogs/patches/patch-lib_uuid_Makefile_in
kili 834c9f8bd5 rename libuuid to libe2fs-uuid and move it back to ${LOCALBASE}/lib.
Rename the uuid(3) manpage to e2fs-uuid(3). Merge subpackackages back
into one single package.

ok and prodded by ajacoutot@
ok landry@
2010-04-03 11:53:58 +00:00

159 lines
6.0 KiB
Plaintext

$OpenBSD: patch-lib_uuid_Makefile_in,v 1.3 2010/04/03 11:53:58 kili Exp $
--- lib/uuid/Makefile.in.orig Tue Feb 19 05:33:10 2008
+++ lib/uuid/Makefile.in Fri Apr 2 21:35:50 2010
@@ -38,18 +38,18 @@ SRCS= $(srcdir)/clear.c \
$(srcdir)/unparse.c \
$(srcdir)/uuid_time.c
-LIBRARY= libuuid
+LIBRARY= libe2fs-uuid
LIBDIR= uuid
-ELF_VERSION = 1.2
-ELF_SO_VERSION = 1
-ELF_IMAGE = libuuid
+ELF_VERSION = $(LIBe2fs-uuid_VERSION)
+ELF_SO_VERSION = $(LIBe2fs-uuid_VERSION)
+ELF_IMAGE = libe2fs-uuid
ELF_MYDIR = uuid
ELF_INSTALL_DIR = $(root_libdir)
ELF_OTHER_LIBS =
BSDLIB_VERSION = 1.1
-BSDLIB_IMAGE = libuuid
+BSDLIB_IMAGE = libe2fs-uuid
BSDLIB_MYDIR = uuid
BSDLIB_INSTALL_DIR = $(root_libdir)
@@ -60,8 +60,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@@ -73,84 +72,65 @@ $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_
cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
tst_uuid.o: $(srcdir)/tst_uuid.c
- @echo " CC $@"
- @$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
+ $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
+ $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
+ $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
$(LIBUUID)
uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
uuid_clear.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_clear.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
uuid_compare.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_compare.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
uuid_copy.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_copy.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
uuid_generate.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_generate.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
uuid_is_null.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_is_null.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
uuid_parse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_parse.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
uuid_time.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_time.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
uuid_unparse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_unparse.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
$(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
- @echo " INSTALL_DATA $(libdir)/libuuid.a"
- @$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
- @echo " INSTALL_DATA $(includedir)/uuid/uuid.h"
- @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
- @for i in $(SMANPAGES); do \
+ $(INSTALL_DATA) libe2fs-uuid.a $(DESTDIR)$(libdir)/libe2fs-uuid.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libe2fs-uuid.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2fs-uuid.a
+ $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
+ for i in $(SMANPAGES); do \
$(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
echo " INSTALL_DATA $(man3dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
done
- @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+ $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- @echo " LINK $(man3dir)/uuid_generate_random.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
- @echo " LINK $(man3dir)/uuid_generate_time.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
- @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
- @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+ $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libuuid.a \
@@ -175,9 +155,9 @@ distclean:: clean
#
# Hack to parallel makes recognize dependencies correctly.
#
-../../lib/libuuid.a: libuuid.a
-../../lib/libuuid.so: image
-../../lib/libuuid.dylib: image
+../../lib/libe2fs-uuid.a: libe2fs-uuid.a
+../../lib/libe2fs-uuid.so: image
+../../lib/libe2fs-uuid.dylib: image
$(OBJS): subdirs