data-in: Get rid of first_column, last_column arguments.

[pspp] / perl-module / automake.mk

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 8eeb0a341ddd0c96a7a70bf6438c6167d391f09e..becee71b18c310d1c9302204b4399ef88d191931 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -23,10 +23,10 @@ perl-module/pspp-module-config: Makefile
         (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
+perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config $(module_sources)
        cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
-perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources)
+perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
        rm -f $@
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
@@ -35,12 +35,13 @@ module-make: perl-module/Makefile src/libpspp-core.la
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
 
 ALL_LOCAL += perl_module_tarball
-perl_module_tarball:
+perl_module_tarball: $(module_sources)
        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 \
                 cp $(top_srcdir)/$$f $$destdir ; \
                 echo cp $(top_srcdir)/$$f $$destdir ; \
          fi ; \
@@ -48,11 +49,6 @@ perl_module_tarball:
        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"
-
 CLEAN_LOCAL += perl_module_clean
 perl_module_clean:
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true