expressions: Rewrite code generator in Python.

[pspp] / src / language / expressions / automake.mk

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index b1f710dc38cf348fd43fde899a59af87a2cb975d..0ff62645c6d9b8e12984e634221e36614fea13e6 100644 (file)
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -35,15 +35,19 @@ expressions_built_sources = \
 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
+       $(PYTHON3) $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
-AM_CPPFLAGS += -I$(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)