e1da3db508
- Remove MAINTAINERS as they agree not having time nor interest for it. - Use install-libs target instead of manually installing some cherrypicked headers - now all needed headers are installed in the right place. - Install fsck and its manpage as fsck_ext2fs instead of the confusing pfsck. - Install uuid.pc as e2fs-uuid.pc to avoid conflicts with devel/uuid. - Patch most Makefiles to print full build commands instead of the non-informative linux-kernel-like output. - Patch some regress tests, more and more works fine now. With feedback and tweaks from naddy@ and pea@
150 lines
5.9 KiB
Plaintext
150 lines
5.9 KiB
Plaintext
$OpenBSD: patch-lib_blkid_Makefile_in,v 1.1 2009/03/15 19:59:31 landry Exp $
|
|
--- lib/blkid/Makefile.in.orig Tue Oct 7 16:22:39 2008
|
|
+++ lib/blkid/Makefile.in Sun Feb 22 11:47:57 2009
|
|
@@ -32,8 +32,8 @@ HFILES_IN= blkid_types.h
|
|
LIBRARY= libblkid
|
|
LIBDIR= blkid
|
|
|
|
-ELF_VERSION = 1.0
|
|
-ELF_SO_VERSION = 1
|
|
+ELF_VERSION = $(LIBblkid_VERSION)
|
|
+ELF_SO_VERSION = $(LIBblkid_VERSION)
|
|
ELF_IMAGE = libblkid
|
|
ELF_MYDIR = blkid
|
|
ELF_INSTALL_DIR = $(root_libdir)
|
|
@@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID)
|
|
DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
|
|
|
|
.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 $<
|
|
@@ -64,66 +63,51 @@ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUU
|
|
all:: $(SMANPAGES) blkid.pc
|
|
|
|
$(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status
|
|
- @echo " CONFIG.STATUS $@"
|
|
- @cd $(top_builddir); \
|
|
+ cd $(top_builddir); \
|
|
CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status
|
|
|
|
libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in
|
|
- @echo " SUBST $@"
|
|
- @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
|
|
+ $(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
|
|
|
|
tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
+ $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
|
|
|
tst_types: tst_types.o blkid_types.h
|
|
- @echo " LD $@"
|
|
- @$(CC) -o tst_types tst_types.o
|
|
+ $(CC) -o tst_types tst_types.o
|
|
|
|
../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h
|
|
- @echo " CC $@"
|
|
- @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
|
|
+ $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
|
|
-o ../../misc/blkid.o
|
|
|
|
blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID)
|
|
- @echo " LD $@"
|
|
- @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
|
|
+ $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
|
|
|
|
test_probe: test_probe.in Makefile
|
|
@echo "Creating test_probe..."
|
|
@@ -138,33 +122,26 @@ check:: all tst_cache tst_dev tst_devname tst_devno ts
|
|
./tst_types
|
|
|
|
blkid.pc: $(srcdir)/blkid.pc.in $(top_builddir)/config.status
|
|
- @echo " CONFIG.STATUS $@"
|
|
- @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
|
|
+ cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
|
|
|
|
installdirs::
|
|
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
|
|
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
|
|
|
|
install:: all installdirs
|
|
- @echo " INSTALL_DATA $(libdir)/libblkid.a"
|
|
- @$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
|
|
- @-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
|
|
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
|
|
- @set -e; for i in $(HFILES); do \
|
|
- echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
|
|
+ $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
|
|
+ $(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
|
|
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
|
|
+ set -e; for i in $(HFILES); do \
|
|
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \
|
|
done
|
|
- @set -e; for i in $(HFILES_IN); do \
|
|
- echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
|
|
+ set -e; for i in $(HFILES_IN); do \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \
|
|
done
|
|
- @for i in $(SMANPAGES); do \
|
|
- echo " INSTALL_DATA $(man3dir)/$$i"; \
|
|
+ for i in $(SMANPAGES); do \
|
|
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
|
|
done
|
|
- @echo " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
|
|
- @$(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
|
|
+ $(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
|
|
|
|
uninstall::
|
|
$(RM) -f $(DESTDIR)$(libdir)/libblkid.a \
|