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 | 410a9bfcf57da22a3a9464e1131214da0e240864 (patch) | |
| tree | 5781503d2e5b6c6a5de9c74cc66fe422bb56a83d | |
| parent | a9625ec754f1cff9c7baef0d9066eed3a902b890 (diff) | |
| download | dmapi-dev-410a9bfcf57da22a3a9464e1131214da0e240864.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 | 34 |
3 files changed, 25 insertions, 14 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=2 PKG_MINOR=2 -PKG_REVISION=6 +PKG_REVISION=7 PKG_BUILD=1 diff --git a/doc/CHANGES b/doc/CHANGES index a72c495..ecda9a0 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,6 @@ +dmapi-2.2.7 (14 July 2006) + - Fix issues with makedepend on libtool libraries. + dmapi-2.2.6 (4 July 2006) - Makefile dependency fixes diff --git a/include/buildrules b/include/buildrules index f721283..4a91fee 100644 --- a/include/buildrules +++ b/include/buildrules @@ -35,15 +35,15 @@ $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS) $(LTCOMPILE) -c $< endif -ifdef LINGUAS +ifdef POTHEAD %.pot: $(XGETTEXTFILES) - xgettext --omit-header --language=C --keyword=_ -o $@ $(XGETTEXTFILES) + $(XGETTEXT) --language=C --keyword=_ -o $@ $(XGETTEXTFILES) -%.po: - $(MSGMERGE) -o $@.tmpo $@ $(PKG_NAME).pot - @if ! diff $@.tmpo $@ >/dev/null; then \ - echo "$@ is out of date, see $@.tmpo"; \ - fi +# Generate temp .po files, to check whether translations need updating. +# Not by default, due to gettext output differences between versions. +%.po: $(POTHEAD) +# $(MSGMERGE) -o $@.tmpo $@ $(POTHEAD) +# if ! diff $@.tmpo $@ >/dev/null; then echo "$@ dated, see $@.tmpo"; fi %.mo: %.po $(MSGFMT) -o $@ $< @@ -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 |