From: Tim Shimmin <tes@sgi.com>
Date: Fri, 14 Jul 2006 15:34:37 +0000 (+0000)
Subject: fix make depend for libtool libraries
X-Git-Tag: v2.9.0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82f8efc6dcf94db6dd827da2589e88c5ee3365a3;p=thirdparty%2Fxfsprogs-dev.git

fix make depend for libtool libraries
Merge of master-melb:xfs-cmds:26539a by kenmcd.
---

diff --git a/VERSION b/VERSION
index 24901a849..ad9656c28 100644
--- 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 a4158db77..808fa09fc 100644
--- 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 41aaef5c8..381527bf8 100644
--- 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