From c3580361c52f0246f71d9b727cb9e5bd0d8497bb Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 12 Oct 2009 20:41:37 -0700 Subject: [PATCH] Don't use $< in target rules, for portability to POSIX make. POSIX only requires $< to be defined for implicit rules, so don't use it in target rules. With this commit, PSPP builds properly from a tarball with NetBSD make version 1.111 on Debian GNU/Linux. --- doc/automake.mk | 3 ++- po/automake.mk | 2 +- src/ui/gui/automake.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/automake.mk b/doc/automake.mk index 26ff4e65..b24eb51e 100644 --- a/doc/automake.mk +++ b/doc/automake.mk @@ -55,7 +55,8 @@ doc/tut.texi: doc/pspp.xml: doc/pspp.texinfo $(doc_pspp_TEXINFOS) @$(MKDIR_P) doc - $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) $< -o - \ + $(MAKEINFO) $(AM_MAKEINFOFLAGS) --docbook -I $(top_srcdir) \ + $(top_srcdir)/doc/pspp.texinfo -o - \ | $(SED) 's/Time-&-Date/Time-\&-Date/g' > $@ docbookdir = $(docdir) diff --git a/po/automake.mk b/po/automake.mk index a36081c4..e7b13096 100644 --- a/po/automake.mk +++ b/po/automake.mk @@ -24,7 +24,7 @@ $(POTFILE): $(TRANSLATABLE_FILES) $(UI_FILES) $(POFILES): $(POTFILE) - $(MSGMERGE) $(top_srcdir)/$@ $< -o $@ + $(MSGMERGE) $(top_srcdir)/$@ $? -o $@ SUFFIXES += .po .gmo diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index a52f2802..7c06b8e4 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -244,10 +244,10 @@ AM_CPPFLAGS += -Isrc src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list echo '#include ' > $@ - glib-genmarshal --body --prefix=psppire_marshal $< >> $@ + glib-genmarshal --body --prefix=psppire_marshal $? >> $@ src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list - glib-genmarshal --header --prefix=psppire_marshal $< > $@ + glib-genmarshal --header --prefix=psppire_marshal $? > $@ SUFFIXES += .glade .ui .glade.ui: -- 2.30.2