diff options
| author | Tim Shimmin <tes@sgi.com> | 2006-07-14 15:34:37 +0000 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2006-07-14 15:34:37 +0000 |
| commit | 6435acc6b12b6a1ada0bdf990de46f87f22dca56 (patch) | |
| tree | 87d3734a1e66c763f432f1c94ee4a6da5d475c0e | |
| parent | 622757f704c45d0d2011d10bb839c9fbdca1a693 (diff) | |
| download | acl-6435acc6b12b6a1ada0bdf990de46f87f22dca56.tar.gz | |
fix make depend for libtool libraries
Merge of master-melb:xfs-cmds:26539a by kenmcd.
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | include/buildrules | 20 |
3 files changed, 18 insertions, 7 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=2 -PKG_REVISION=40 +PKG_REVISION=41 PKG_BUILD=1 diff --git a/doc/CHANGES b/doc/CHANGES index 9015e6d..4d2df5e 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,6 @@ +2.2.41 (14 July 2006) +* Fix issues with makedepend on libtool libraries. + 2.2.40 (03 July 2006) * Update translation Makefile to work better with the Ubuntu translation system. Thanks to feedback from Martin Pitt. diff --git a/include/buildrules b/include/buildrules index 41aaef5..4a91fee 100644 --- a/include/buildrules +++ b/include/buildrules @@ -58,20 +58,28 @@ $(_FORCE): .PHONY : depend -depend : $(CFILES) $(HFILES) - $(SUBDIRS_MAKERULE) - touch .dep - $(MAKEDEPEND) $(DEPENDFLAGS) -f - -- $(CFLAGS) -- $(CFILES) | \ +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 |