Replace "all-hook" with "all-local".
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 31 Aug 2009 18:32:00 +0000 (20:32 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Mon, 31 Aug 2009 18:32:00 +0000 (20:32 +0200)
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

Makefile.am
perl-module/automake.mk
po/automake.mk

index 111fe7d023b293bb84ccbb26e4ba4f0bc81a9649..507503f0235a3eaf6596c25680d3bf84e00e4b00 100644 (file)
@@ -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)
index 4450112039e0877230631d1f5a777aaee8fcd70b..9c30cef6aaab7add53412aa51504cef203d8faa8 100644 (file)
@@ -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"
index d1d26aee6cef229e38d32f7a4e6bd05edc1b69e5..1f5ca31bd0b1c3607586d7d5bdc0cc4895a102ea 100644 (file)
@@ -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 \