fix make depend for libtool libraries

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

diff --git a/include/buildrules b/include/buildrules
index f7212831058d9f9eaf229603808c735f7d5af365..4a91fee37f20de90d5a6c6adeea022c23ecf6e8d 100644 (file)
--- a/include/buildrules
+++ b/include/buildrules
@@ -35,15 +35,15 @@ $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS)
        $(LTCOMPILE) -c $<
 endif
 
        $(LTCOMPILE) -c $<
 endif
 

-ifdef LINGUAS
+ifdef POTHEAD

 %.pot: $(XGETTEXTFILES)
 %.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 $@ $<
 
 %.mo: %.po
        $(MSGFMT) -o $@ $<


@@ -58,20 +58,28 @@ $(_FORCE):
 
 .PHONY : depend
 
 
 .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' \
        $(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
        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
 $(OBJECTS): $(HFILES)
 endif

+endif