fix make depend for libtool libraries

Merge of master-melb:xfs-cmds:26539a by kenmcd.

diff --git a/VERSION b/VERSION
index 24901a8497681a0ce309242b78ee31c1f73e65c9..ad9656c28069dd88dc9d7dd8c0b996bff9f90026 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=8
-PKG_REVISION=7
+PKG_REVISION=8
 PKG_BUILD=1

diff --git a/doc/CHANGES b/doc/CHANGES
index a4158db770efbfbded00d86a73cd7f56fb4dbc73..808fa09fc0a745ca0ffb7843373dd18e71bd57b9 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+xfsprogs-2.8.8 (14 July 2006)
+       - Fix issues with makedepend on libtool libraries.
+
 xfsprogs-2.8.7 (10 July 2006)
        - Fix build of xfs_logprint for different uuid_t definitions;
           thanks to Craig Rodrigues.

diff --git a/include/buildrules b/include/buildrules
index 41aaef5c8d28336b34f7d1d195fd4ff83e8e2fbb..381527bf866468076654e94ad04926bf5507d1e2 100644 (file)
--- a/include/buildrules
+++ b/include/buildrules
@@ -58,20 +58,29 @@ $(_FORCE):
 
 .PHONY : depend
 
-depend : $(CFILES) $(HFILES)
-       $(SUBDIRS_MAKERULE)
-       touch .dep
-       $(MAKEDEPEND) $(DEPENDFLAGS) -f - -- $(CFLAGS) -- $(CFILES) | \
-       $(SED) -e 's,`pwd`,$(TOPDIR),g' \
+DEPENDSCRIPT := $(MAKEDEPEND) $(DEPENDFLAGS) -f - -- $(CFLAGS) -- $(CFILES) | \
+       $(SED) \
+           -e 's,`pwd`,$(TOPDIR),g' \
            -e 's,  */[^ ]*,,g' \
            -e '/^[^ ]*: *$$/d' \
-           -e '/^#.*/d' -e '/^ *$$/d' \
-       > .dep
+           -e '/^ *$$/d'
+
+ifdef LTLIBRARY
+DEPENDSCRIPT := $(DEPENDSCRIPT) | $(SED) -e 's,^\([^:]*\)\.o,\1.lo,'
+endif
+
+depend : $(CFILES) $(HFILES)
+       $(SUBDIRS_MAKERULE)
+       $(DEPENDSCRIPT) > .dep
        test -s .dep || rm -f .dep
 
 # Include dep, but only if it exists
 ifeq ($(shell test -f .dep && echo .dep), .dep)
 include .dep
 else
+ifdef LTLIBRARY
+$(LTOBJECTS): $(HFILES)
+else
 $(OBJECTS): $(HFILES)
 endif
+endif