pivot table procedure conceptually works

[pspp] / perl-module / automake.mk

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 8eeb0a341ddd0c96a7a70bf6438c6167d391f09e..276af3930accccc6200ec53da4446ee1c7c4864d 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -15,43 +15,45 @@ module_sources = \
  perl-module/lib/PSPP.pm \
  perl-module/t/Pspp.t
 
+PERL_MAKEFLAGS = $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
+
 perl-module/pspp-module-config: Makefile
-       (echo '%Locations = (';\
+       $(AM_V_GEN)(echo '%Locations = (';\
         printf "  SourceDir => '";\
         (cd $(top_srcdir) && echo `pwd`\', ) ;\
         printf "  BuildDir => '";\
         (cd $(top_builddir) && echo `pwd`\' );\
         echo ');') > $(top_builddir)/perl-module/pspp-module-config
 
-perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
-       cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
+perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(module_sources)
+       $(AM_V_GEN)cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
-perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources)
-       rm -f $@
-       cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
+perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
+       $(AM_V_at)rm -f $@
+       $(AM_V_GEN)cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) tardist
 
 PHONY += module-make
-module-make: perl-module/Makefile src/libpspp-core.la
-       cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
+module-make: perl-module/Makefile
+       $(AM_V_GEN)cd perl-module && $(MAKE) $(PERL_MAKEFLAGS)
 
 ALL_LOCAL += perl_module_tarball
-perl_module_tarball:
-       if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
+perl_module_tarball: $(module_sources) src/libpspp-core.la
+       @if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
         for f in $(module_sources); do \
          destdir=`dirname $$f` ;\
          mkdir -p $$destdir ;\
-         if test "$(top_srcdir)/$$f" -nt "$(top_builddir)/$$f" ; then \
+         if test ! -e "$(top_builddir)/$$f" || \
+            test "$(top_srcdir)/$$f" -nt "$(top_builddir)/$$f" ; then \
+                if $(AM_V_P); then \
+                     echo cp $(top_srcdir)/$$f $$destdir ; \
+                else \
+                     echo "  GEN      $$destdir/$$f"; \
+                fi; \
                 cp $(top_srcdir)/$$f $$destdir ; \
-                echo cp $(top_srcdir)/$$f $$destdir ; \
          fi ; \
         done \
        fi
-       $(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
-
-CHECK_LOCAL += perl_module_check
-perl_module_check:
-       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"
+       $(AM_V_GEN)$(MAKE) $(PERL_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
 
 CLEAN_LOCAL += perl_module_clean
 perl_module_clean: