From: Ben Pfaff <blp@gnu.org>
Date: Fri, 9 Oct 2009 02:50:59 +0000 (-0700)
Subject: Declare Makefile suffixes, to be a little closer to POSIX make compliance.
X-Git-Tag: lenny-x64-build41~9
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=4ba231eb219f2cd1daa45297672b61bcc11cfcff

Declare Makefile suffixes, to be a little closer to POSIX make compliance.

POSIX requires that suffixes used in implicit rules be declared.  Automake
allows one to do that by adding the suffixes to a variable named SUFFIXES.
We weren't doing that consistently, and this commit fixes that up.

POSIX doesn't allow suffixes to contain more than one period, so this isn't
a complete fix, since the Makefiles still use .h.pl and .inc.pl as
suffixes.  There are other reasons, too, why the PSPP Makefiles are not
POSIX-compliant.
---

diff --git a/Makefile.am b/Makefile.am
index 6fca4b1c..dc5314bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ DIST_HOOKS =
 INSTALL_DATA_HOOKS = 
 UNINSTALL_DATA_HOOKS =
 PHONY =
+SUFFIXES = .q
 
 generate-changelog:
 	if test -d $(top_srcdir)/.git; then			\
diff --git a/po/automake.mk b/po/automake.mk
index 67d68d74..95493a7d 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -27,6 +27,7 @@ $(POFILES): $(POTFILE)
 	$(MSGMERGE) $(top_srcdir)/$@ $< -o $@
 
 
+SUFFIXES += .po .gmo
 .po.gmo:
 	@$(MKDIR_P) `dirname $@`
 	$(MSGFMT) $< -o $@
diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index bc4e830d..4dc2d145 100644
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -27,7 +27,7 @@ EXTRA_DIST += $(helpers) $(expressions_built_sources:=.pl)
 AM_CPPFLAGS += -I$(top_builddir)/src/language/expressions \
 	-I$(top_srcdir)/src/language/expressions
 
-SUFFIXES = .h.pl .inc.pl
+SUFFIXES += .h.pl .inc.pl
 
 generate_from_pl = $(MKDIR_P) `dirname $@` && \
 	$(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index f14ca3ac..cd7dba9a 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -249,6 +249,7 @@ src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
 	glib-genmarshal --header --prefix=psppire_marshal $< > $@
 
+SUFFIXES += .glade .ui
 .glade.ui:
 	$(top_srcdir)/lib/gtk-contrib/gtk-builder-convert $< $@