work on PRINT encoding

[pspp] / perl-module / automake.mk

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 71d589f516b7053b074907d4b45fda762ffcc709..fae888633b2e8625a9cd001b80ff7bde6275ae66 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -15,64 +15,53 @@ module_sources = \
  perl-module/lib/PSPP.pm \
  perl-module/t/Pspp.t
 
-perl-module/pspp-module-config: Makefile
-       target=`mktemp`;\
-       echo '%Locations = (' > $$target ;\
-       printf "  SourceDir => '" >> $$target ;\
-       (cd $(top_srcdir) && echo `pwd`\', ) >> $$target ;\
-       printf "  BuildDir => '" >> $$target ;\
-       (cd $(top_builddir) && echo `pwd`\' ) >> $$target ;\
-       echo ');' >> $$target ;\
-       cp $$target $(top_builddir)/perl-module/pspp-module-config
-
-
+PERL_MAKEFLAGS = $(AM_MAKEFLAGS) LD_RUN_PATH=$(pkglibdir)
 
-perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
+perl-module/pspp-module-config: Makefile
+       (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 $(module_sources)
        cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
+perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources) perl-module/Makefile
+       rm -f $@
+       cd perl-module && $(MAKE) $(PERL_MAKEFLAGS) tardist
 
-PSPP-Perl-$(VERSION).tar.gz:
-       cd perl-module && $(RM) $@
-       cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
-
-.PHONY: module-make
+PHONY += module-make
 module-make: perl-module/Makefile
-       cd perl-module && $(MAKE) $(AM_MAKEFLAGS)
+       cd perl-module && $(MAKE) $(PERL_MAKEFLAGS)
 
-perl-module/lib/pspp-vers.pl: src/libpspp/version.c Makefile
-       mkdir -p perl-module/lib
-       (cd $(top_srcdir) && echo "\$$top_srcdir='"`pwd`"';") > $@
-       $(GREP) '^\$$VERSION' $(top_builddir)/src/libpspp/version.c | $(SED) -e 's/VERSION/PSPP::VERSION/' >> $@
-
-all-local: perl-module/lib/pspp-vers.pl
-       if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
+ALL_LOCAL += perl_module_tarball
+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 \
                 cp $(top_srcdir)/$$f $$destdir ; \
+                echo cp $(top_srcdir)/$$f $$destdir ; \
          fi ; \
         done \
        fi
-       $(MAKE) $(AM_MAKEFLAGS) module-make PSPP-Perl-$(VERSION).tar.gz
-
-check-local:
-       loc=`pwd` ; cd $(top_builddir)/src/.libs ; llp=`pwd` ; cd $$loc ;  \
-       LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test "
+       $(MAKE) $(PERL_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
 
-
-clean-local:
-       cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean
+CLEAN_LOCAL += perl_module_clean
+perl_module_clean:
+       cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true
        if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
-         $(RM) $(module_sources) ; \
+         rm -f $(module_sources) ; \
        fi
-       $(RM) perl-module/Makefile.old
-
+       rm -f perl-module/Makefile.old
 
 CLEANFILES += \
-        perl-module/PSPP-Perl-$(VERSION).tar.gz \
+        perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz \
        perl-module/pspp-module-config \
-       perl-module/lib/pspp-vers.pl \
        perl-module/const-c.inc \
        perl-module/const-xs.inc