blkid.pc, ss.pc: Move private libs from "Libs:" to "Libs.private:"

[tools/e2fsprogs.git] / lib / blkid / Makefile.in

diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index b70bae6..bf0012e 100644 (file)
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -19,11 +19,12 @@ all::
 SMANPAGES=     libblkid.3
 
 OBJS= cache.o dev.o devname.o devno.o getsize.o llseek.o probe.o \
- read.o resolve.o save.o tag.o
+ read.o resolve.o save.o tag.o version.o 
 
 SRCS= $(srcdir)/cache.c $(srcdir)/dev.c $(srcdir)/devname.c $(srcdir)/devno.c \
  $(srcdir)/getsize.c $(srcdir)/llseek.c $(srcdir)/probe.c \
- $(srcdir)/read.c $(srcdir)/resolve.c $(srcdir)/save.c $(srcdir)/tag.c
+ $(srcdir)/read.c $(srcdir)/resolve.c $(srcdir)/save.c $(srcdir)/tag.c \
+ $(srcdir)/version.c
 
 HFILES=                blkid.h
 HFILES_IN=     blkid_types.h
@@ -36,7 +37,7 @@ ELF_SO_VERSION = 1
 ELF_IMAGE = libblkid
 ELF_MYDIR = blkid
 ELF_INSTALL_DIR = $(root_libdir)
-ELF_OTHER_LIBS = -L../.. -luuid
+ELF_OTHER_LIBS = -L../.. -luuid $(DEVMAPPER_LIBS)
 
 BSDLIB_VERSION = 2.0
 BSDLIB_IMAGE = libblkid
@@ -60,7 +61,7 @@ DEPLIBS_BLKID=        $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
 @ELF_CMT@      @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
 @BSDLIB_CMT@   @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
 
-all:: $(SMANPAGES)
+all:: $(SMANPAGES) blkid.pc
 
 $(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status
        @echo " CONFIG.STATUS $@"
@@ -107,6 +108,14 @@ tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID)
        @echo " LD $@"
        @$(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)
+
+tst_types: tst_types.o blkid_types.h 
+       @echo " LD $@"
+       @$(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 \
@@ -116,13 +125,26 @@ blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID)
        @echo " LD $@"
        @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
 
-check:: all tst_cache tst_devname tst_devno tst_getsize tst_probe \
- tst_read tst_resolve tst_save
+test_probe: test_probe.in Makefile
+       @echo "Creating test_probe..."
+       @echo "#!/bin/sh" > test_probe
+       @echo "SRCDIR=@srcdir@" >> test_probe
+       @cat $(srcdir)/test_probe.in >> test_probe
+       @chmod +x test_probe
+
+check:: all tst_cache tst_dev tst_devname tst_devno tst_getsize tst_probe \
+ tst_read tst_resolve tst_save tst_tag test_probe tst_types
+       ./test_probe
+       ./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
 
 installdirs::
        @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
        @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
-               $(DESTDIR)$(includedir)/blkid
+               $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
 
 install:: all installdirs 
        @echo " INSTALL_DATA $(libdir)/libblkid.a"
@@ -141,22 +163,32 @@ install:: all installdirs
                echo "  INSTALL_DATA $(man3dir)/$$i"; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
        done
+       @echo " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
+       @$(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
 
 uninstall::
-       $(RM) -f $(DESTDIR)$(libdir)/libblkid.a
+       $(RM) -f $(DESTDIR)$(libdir)/libblkid.a \
+               $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
        $(RM) -rf $(DESTDIR)$(includedir)/blkid
        for i in $(SMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man3dir)/$$i; \
        done
 
 clean::
-       $(RM) -f \#* *.s *.o *.orig *.a *~ *.bak tst_* core profiled/* \
+       $(RM) -f \#* *.s *.o *.orig *.a *~ *.bak tst_cache tst_dev tst_devname \
+               tst_devno tst_getsize tst_probe tst_read tst_resolve tst_save \
+               tst_tag tst_types tests/*.out tests/*.ok \
+               tests/*.img results test_probe core profiled/* \
                checker/* blkid_types.h ../libblkid.a ../libblkid_p.a \
                $(SMANPAGES) blkid
+       -rmdir tests
 
 mostlyclean:: clean
 distclean:: clean
-       $(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
+       $(RM) -f .depend Makefile blkid.pc \
+               $(srcdir)/TAGS $(srcdir)/Makefile.in.old
+
+$(OBJS): subdirs
 
 # +++ Dependency line eater +++
 # 
@@ -182,8 +214,10 @@ read.o: $(srcdir)/read.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
  $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h \
  $(top_srcdir)/lib/uuid/uuid.h
 resolve.o: $(srcdir)/resolve.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h $(srcdir)/probe.h
+ $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
 save.o: $(srcdir)/save.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
  $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
 tag.o: $(srcdir)/tag.c $(srcdir)/blkidP.h $(srcdir)/blkid.h \
  $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/list.h
+version.o: $(srcdir)/version.c $(srcdir)/blkid.h \
+ $(top_builddir)/lib/blkid/blkid_types.h $(top_srcdir)/version.h