From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 31 Aug 2009 18:32:00 +0000 (+0200)
Subject: Replace "all-hook" with "all-local".
X-Git-Tag: build37~10
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb9c30ebea7269e9eae90bd9ab5e0a363478297;p=pspp-builds.git

Replace "all-hook" with "all-local".

all-hook isn't a target recognised by automake, so use all-local instead,
and avoid it clashing with the all-local in perl-module
---

diff --git a/Makefile.am b/Makefile.am
index 111fe7d0..507503f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
 
 CLEANFILES = 
 CLEAN_LOCAL =
+ALL_LOCAL =
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 noinst_LIBRARIES=
 noinst_LTLIBRARIES=
@@ -81,3 +82,4 @@ install-data-hook: $(INSTALL_DATA_HOOKS)
 uninstall-hook: $(UNINSTALL_DATA_HOOKS)
 
 clean-local: $(CLEAN_LOCAL)
+all-local: $(ALL_LOCAL)
diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 44501120..9c30cef6 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -36,7 +36,7 @@ PHONY += module-make
 module-make: perl-module/Makefile src/libpspp-core.la
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
-all-local: 
+perl_module_tarball:
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
 	 for f in $(module_sources); do \
 	  destdir=`dirname $$f` ;\
@@ -49,6 +49,8 @@ all-local:
 	fi
 	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION).tar.gz
 
+ALL_LOCAL += perl_module_tarball
+
 check-local:
 	loc=`pwd` ; cd $(top_builddir)/src/.libs ; llp=`pwd` ; cd $$loc ;  \
 	LANG=C LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test"
diff --git a/po/automake.mk b/po/automake.mk
index d1d26aee..1f5ca31b 100644
--- a/po/automake.mk
+++ b/po/automake.mk
@@ -32,7 +32,7 @@ $(POFILES): $(POTFILE)
 
 GMOFILES = $(POFILES:.po=.gmo)
 
-all-hook: $(GMOFILES)
+ALL_LOCAL += $(GMOFILES)
 
 install-data-hook: $(GMOFILES)
 	for f in $(GMOFILES); do \