diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:07:34 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-06-12 12:07:34 +0100 |
| commit | 485edc675200ff3097cec521c357441a1c2d9b0d (patch) | |
| tree | 7edee2fc5e1fb60caa90f3bb26b1becde9691b99 /lib/blkid/Makefile.in | |
| parent | 1ab0ea88057e922a89c6b8feebeb62c57e40f8de (diff) | |
| parent | 5f4b406b03dc9fa27c78184df5b1d501e373ca01 (diff) | |
| download | e2fsprogs-485edc675200ff3097cec521c357441a1c2d9b0d.tar.gz | |
Merge 'baserock/richardmaw/yakshave/util-linux-blkid' into baserock/morphbaserock/morph
Reviewed-by: Lars Wirzenius
Reviewed-by: Sam Thursfield
Diffstat (limited to 'lib/blkid/Makefile.in')
| -rw-r--r-- | lib/blkid/Makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in index f23a1376..14724325 100644 --- a/lib/blkid/Makefile.in +++ b/lib/blkid/Makefile.in @@ -36,7 +36,7 @@ ELF_SO_VERSION = 1 ELF_IMAGE = libblkid ELF_MYDIR = blkid ELF_INSTALL_DIR = $(root_libdir) -ELF_OTHER_LIBS = -L../.. -luuid +ELF_OTHER_LIBS = -luuid BSDLIB_VERSION = 2.0 BSDLIB_IMAGE = libblkid @@ -55,6 +55,7 @@ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) .c.o: $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ + $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< @CHECKER_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $< @ELF_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $< @@ -117,7 +118,7 @@ tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID) tst_types: tst_types.o blkid_types.h $(E) " LD $@" - $(Q) $(CC) -o tst_types tst_types.o + $(Q) $(CC) -o tst_types $(ALL_LDFLAGS) tst_types.o ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h $(E) " CC $@" @@ -147,7 +148,7 @@ blkid.pc: $(srcdir)/blkid.pc.in $(top_builddir)/config.status installdirs:: $(E) " MKINSTALLDIRS $(libdir) $(includedir)/blkid" $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig + $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(pkgconfigdir) install:: all installdirs $(E) " INSTALL_DATA $(libdir)/libblkid.a" @@ -162,12 +163,12 @@ install:: all installdirs echo " INSTALL_DATA $(man3dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \ done - $(E) " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc" - $(Q) $(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc + $(E) " INSTALL_DATA $(pkgconfigdir)/blkid.pc" + $(Q) $(INSTALL_DATA) blkid.pc $(DESTDIR)$(pkgconfigdir)/blkid.pc uninstall:: $(RM) -f $(DESTDIR)$(libdir)/libblkid.a \ - $(DESTDIR)$(libdir)/pkgconfig/blkid.pc + $(DESTDIR)$(pkgconfigdir)/blkid.pc $(RM) -rf $(DESTDIR)$(includedir)/blkid for i in $(SMANPAGES); do \ $(RM) -f $(DESTDIR)$(man3dir)/$$i; \ |