Fix Makefile dependencies for libcom_err

[android-x86/external-e2fsprogs.git] / misc / Makefile.in

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 63b4c20..d3dd2d0 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -17,16 +17,22 @@ INSTALL = @INSTALL@
 @UUIDD_CMT@UUIDD_PROG= uuidd
 @UUIDD_CMT@UUIDD_MAN= uuidd.8
 
-SPROGS=                mke2fs badblocks tune2fs dumpe2fs blkid logsave \
+@BLKID_CMT@BLKID_PROG= blkid
+@BLKID_CMT@BLKID_MAN= blkid.8
+
+@BLKID_CMT@FINDFS_LINK= findfs
+@BLKID_CMT@FINDFS_MAN= findfs.8
+
+SPROGS=                mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
                        $(E2IMAGE_PROG) @FSCK_PROG@ e2undo
 USPROGS=       mklost+found filefrag $(UUIDD_PROG)
 SMANPAGES=     tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
-                       e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \
+                       e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
                        logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@
 FMANPAGES=     mke2fs.conf.5
 
-UPROGS=                chattr lsattr uuidgen
-UMANPAGES=     chattr.1 lsattr.1 uuidgen.1
+UPROGS=                chattr lsattr @UUID_CMT@ uuidgen
+UMANPAGES=     chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
 
 LPROGS=                @E2INITRD_PROG@
 
@@ -74,15 +80,15 @@ SRCS=       $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \
                $(srcdir)/e2undo.c
 
 LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) 
+DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR)
 PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
-PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
+PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR)
 
 STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
-STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) 
+STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) 
 
 LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
-DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) 
+DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR) 
 
 COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
 
@@ -290,9 +296,10 @@ filefrag.profiled: $(PROFILED_FILEFRAG_OBJS)
        @$(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
                $(PROFILED_FILEFRAG_OBJS) 
 
-tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
+tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR)
        @echo " LD $@"
-       $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
+       $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \
+               $(LIBCOM_ERR)
 
 tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in
        @echo " SUBST $@"
@@ -402,9 +409,11 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
        @echo " LINK $(root_sbindir)/e2label"
        @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
                $(DESTDIR)$(root_sbindir)/e2label
-       @echo " LINK $(root_sbindir)/findfs"
-       @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
-               $(DESTDIR)$(root_sbindir)/findfs
+       @if test -n "$(FINDFS_LINK)"; then \
+               echo "  LINK $(root_sbindir)/findfs"; \
+               $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+                       $(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
+       fi
        @for i in $(UPROGS); do \
                echo "  INSTALL $(bindir)/$$i"; \
                $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
@@ -514,7 +523,7 @@ uninstall:
        for i in $(UMANPAGES); do \
                $(RM) -f $(DESTDIR)$(man1dir)/$$i; \
        done
-       for i in findfs e2label ; do \
+       for i in $(FINDFS_LINK) e2label ; do \
                $(RM) -f $(DESTDIR)$(root_sbindir)/$$i; \
        done
        for i in $(FMANPAGES); do \