X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2Fautomake.mk;h=4450112039e0877230631d1f5a777aaee8fcd70b;hb=99bafccc08919a5d640cb35962c4d730a2cad3a1;hp=71d589f516b7053b074907d4b45fda762ffcc709;hpb=5e7e6c8417aee2b983d1725101bf66fe5fea2aaa;p=pspp-builds.git

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 71d589f5..44501120 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -25,54 +25,47 @@ perl-module/pspp-module-config: Makefile
 	echo ');' >> $$target ;\
 	cp $$target $(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)
 
-
-PSPP-Perl-$(VERSION).tar.gz:
-	cd perl-module && $(RM) $@
+perl-module/PSPP-Perl-$(VERSION).tar.gz: $(module_sources)
+	$(RM) $@
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
-.PHONY: module-make
-module-make: perl-module/Makefile
+PHONY += module-make
+module-make: perl-module/Makefile src/libpspp-core.la
 	cd perl-module && $(MAKE) $(AM_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
+all-local: 
 	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 \
 		 cp $(top_srcdir)/$$f $$destdir ; \
+		 echo cp $(top_srcdir)/$$f $$destdir ; \
 	  fi ; \
 	 done \
 	fi
-	$(MAKE) $(AM_MAKEFLAGS) module-make PSPP-Perl-$(VERSION).tar.gz
+	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/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 "
+	LANG=C LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test"
 
 
-clean-local:
-	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean
+perl_module_CLEAN:
+	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
 	  $(RM) $(module_sources) ; \
 	fi
 	$(RM) perl-module/Makefile.old
 
+CLEAN_LOCAL += perl_module_CLEAN
 
 CLEANFILES += \
         perl-module/PSPP-Perl-$(VERSION).tar.gz \
 	perl-module/pspp-module-config \
-	perl-module/lib/pspp-vers.pl \
 	perl-module/const-c.inc \
 	perl-module/const-xs.inc