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 6fca4b1c29699b2bd77cb74fe4b416a7b0d9ac9e..dc5314bf0fac10be07391030f7d7270734184f54 100644 (file)
--- 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 67d68d741e24a6e09ef7506d4b54841db8e7e099..95493a7d526fda28f8a235ae56a9fc6ed4cc6c99 100644 (file)
--- 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 bc4e830d7ffefc010cf3283d6f237fb8dc58a880..4dc2d145d1a1b6a18461915d49cb2a77f052ac5f 100644 (file)
--- 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 f14ca3ac62c0d5609c2abb1c08a789c4871d9295..cd7dba9ab1eaef610446820c02485b216c9bfdaf 100644 (file)
--- 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 $< $@