X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fautomake.mk;h=97c9f69e9314dd5cee3a682a9e4045db047f4d14;hb=f5dd6243820dbcd19c1d3201436fc01fffc475e5;hp=e741f5adbecac179060b1bbc5a394b68abf8737e;hpb=782d4ee58b929233c71004fca38bd63d3c553c20;p=pspp

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index e741f5adbe..97c9f69e93 100644
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -32,22 +32,23 @@ expressions_built_sources = \
 	src/language/expressions/optimize.inc \
 	src/language/expressions/parse.inc
 
-BUILT_SOURCES += $(expressions_built_sources)
 CLEANFILES += $(expressions_built_sources)
 
-helpers = src/language/expressions/generate.pl \
+helpers = src/language/expressions/generate.py \
 	src/language/expressions/operations.def
 EXTRA_DIST += $(helpers)
 
 $(expressions_built_sources): $(helpers)
-	$(AV_V_GEN)$(MKDIR_P) `dirname $@` && \
-	$(PERL) $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
+	$(AM_V_GEN)$(MKDIR_P) `dirname $@`
+	$(AM_V_at)$(PYTHON3) $< -o `basename $@` \
+	  -i $(top_srcdir)/src/language/expressions/operations.def > $@.tmp
+	$(AM_V_at)mv $@.tmp $@
 
-AM_CPPFLAGS += -I$(abs_top_builddir)/src/language/expressions \
-	-I$(top_srcdir)/src/language/expressions
+AM_CPPFLAGS += -I"$(abs_top_builddir)/src/language/expressions" \
+	-I"$(top_srcdir)/src/language/expressions"
 
 EXTRA_DIST += src/language/expressions/TODO
 
-# This seems to be necessary in order to prevent issues building the native
-# build when cross compiling
-src/language/expressions/evaluate.lo: $(expressions_built_sources)
+src/language/expressions/evaluate.lo src/language/expressions/helpers.lo \
+src/language/expressions/optimize.lo src/language/expressions/parse.lo: \
+$(expressions_built_sources)