Fix build requirements by correctly noting that Python is required.

[pspp] / src / output / spv / automake.mk

diff --git a/src/output/spv/automake.mk b/src/output/spv/automake.mk
index 37f98c3f131bd03e606439ed4fb511e30fb2e65e..061fc03ecfcf11e9c5912aa5bb34193999fe12b0 100644 (file)
--- a/src/output/spv/automake.mk
+++ b/src/output/spv/automake.mk
@@ -19,17 +19,14 @@
 src_output_liboutput_la_SOURCES += \
        src/output/spv/spv-css-parser.c \
        src/output/spv/spv-css-parser.h \
-       src/output/spv/spv-dump.c \
        src/output/spv/spv-legacy-data.c \
        src/output/spv/spv-legacy-data.h \
        src/output/spv/spv-legacy-decoder.c \
        src/output/spv/spv-legacy-decoder.h \
        src/output/spv/spv-light-decoder.c \
        src/output/spv/spv-light-decoder.h \
-       src/output/spv/spv-output.c \
-       src/output/spv/spv-output.h \
-       src/output/spv/spv-select.c \
-       src/output/spv/spv-select.h \
+       src/output/spv/spv-table-look.c \
+       src/output/spv/spv-table-look.h \
        src/output/spv/spv-writer.c \
        src/output/spv/spv-writer.h \
        src/output/spv/spv.c \
@@ -48,10 +45,10 @@ light_binary_out = \
        src/output/spv/light-binary-parser.c \
        src/output/spv/light-binary-parser.h
 src/output/spv/light-binary-parser.c: $(light_binary_in)
-       $(AM_V_GEN)$(PYTHON) $^ code spvlb '"output/spv/light-binary-parser.h"' > $@.tmp
+       $(AM_V_GEN)$(PYTHON3) $^ code spvlb '"output/spv/light-binary-parser.h"' > $@.tmp
        $(AM_V_at)mv $@.tmp $@
 src/output/spv/light-binary-parser.h: $(light_binary_in)
-       $(AM_V_GEN)$(PYTHON) $^ header spvlb > $@.tmp && mv $@.tmp $@
+       $(AM_V_GEN)$(PYTHON3) $^ header spvlb > $@.tmp && mv $@.tmp $@
 nodist_src_output_liboutput_la_SOURCES += $(light_binary_out)
 BUILT_SOURCES += $(light_binary_out)
 CLEANFILES += $(light_binary_out)
@@ -64,10 +61,10 @@ old_binary_out = \
        src/output/spv/old-binary-parser.c \
        src/output/spv/old-binary-parser.h
 src/output/spv/old-binary-parser.c: $(old_binary_in)
-       $(AM_V_GEN)$(PYTHON) $^ code spvob '"output/spv/old-binary-parser.h"' > $@.tmp
+       $(AM_V_GEN)$(PYTHON3) $^ code spvob '"output/spv/old-binary-parser.h"' > $@.tmp
        $(AM_V_at)mv $@.tmp $@
 src/output/spv/old-binary-parser.h: $(old_binary_in)
-       $(AM_V_GEN)$(PYTHON) $^ header spvob > $@.tmp && mv $@.tmp $@
+       $(AM_V_GEN)$(PYTHON3) $^ header spvob > $@.tmp && mv $@.tmp $@
 nodist_src_output_liboutput_la_SOURCES += $(old_binary_out)
 BUILT_SOURCES += $(old_binary_out)
 CLEANFILES += $(old_binary_out)
@@ -80,10 +77,10 @@ detail_xml_out = \
        src/output/spv/detail-xml-parser.c \
        src/output/spv/detail-xml-parser.h
 src/output/spv/detail-xml-parser.c: $(detail_xml_in)
-       $(AM_V_GEN)$(PYTHON) $^ code spvdx '"output/spv/detail-xml-parser.h"' > $@.tmp
+       $(AM_V_GEN)$(PYTHON3) $^ code spvdx '"output/spv/detail-xml-parser.h"' > $@.tmp
        $(AM_V_at)mv $@.tmp $@
 src/output/spv/detail-xml-parser.h: $(detail_xml_in)
-       $(AM_V_GEN)$(PYTHON) $^ header spvdx > $@.tmp && mv $@.tmp $@
+       $(AM_V_GEN)$(PYTHON3) $^ header spvdx > $@.tmp && mv $@.tmp $@
 nodist_src_output_liboutput_la_SOURCES += $(detail_xml_out)
 BUILT_SOURCES += $(detail_xml_out)
 CLEANFILES += $(detail_xml_out)
@@ -96,11 +93,44 @@ structure_xml_out = \
        src/output/spv/structure-xml-parser.c \
        src/output/spv/structure-xml-parser.h
 src/output/spv/structure-xml-parser.c: $(structure_xml_in)
-       $(AM_V_GEN)$(PYTHON) $^ code spvsx '"output/spv/structure-xml-parser.h"' > $@.tmp
+       $(AM_V_GEN)$(PYTHON3) $^ code spvsx '"output/spv/structure-xml-parser.h"' > $@.tmp
        $(AM_V_at)mv $@.tmp $@
 src/output/spv/structure-xml-parser.h: $(structure_xml_in)
-       $(AM_V_GEN)$(PYTHON) $^ header spvsx > $@.tmp && mv $@.tmp $@
+       $(AM_V_GEN)$(PYTHON3) $^ header spvsx > $@.tmp && mv $@.tmp $@
 nodist_src_output_liboutput_la_SOURCES += $(structure_xml_out)
 BUILT_SOURCES += $(structure_xml_out)
 CLEANFILES += $(structure_xml_out)
 EXTRA_DIST += $(structure_xml_in)
+
+tlo_in = \
+       src/output/spv/binary-parser-generator \
+       src/output/spv/tlo.grammar
+tlo_out = \
+       src/output/spv/tlo-parser.c \
+       src/output/spv/tlo-parser.h
+src/output/spv/tlo-parser.c: $(tlo_in)
+       $(AM_V_GEN)$(PYTHON3) $^ code tlo '"output/spv/tlo-parser.h"' > $@.tmp
+       $(AM_V_at)mv $@.tmp $@
+src/output/spv/tlo-parser.h: $(tlo_in)
+       $(AM_V_GEN)$(PYTHON3) $^ header tlo > $@.tmp && mv $@.tmp $@
+nodist_src_output_liboutput_la_SOURCES += $(tlo_out)
+BUILT_SOURCES += $(tlo_out)
+CLEANFILES += $(tlo_out)
+EXTRA_DIST += $(tlo_in)
+
+# These explicit dependencies seem to be necessary when cross building ---
+# more precisely, when building the native build necessary to build the cross.
+# Note that the use of the pspp_kludge_N variables is necessary.  Otherwise
+# automake thinks if need not emit build rules for these items.
+pspp_kludge_0=src/output/spv/liboutput_la-spv-legacy-data.lo
+$(pspp_kludge_0): src/output/spv/old-binary-parser.h
+
+pspp_kludge_1=src/output/spv/liboutput_la-spv-legacy-decoder.lo
+$(pspp_kludge_1): src/output/spv/detail-xml-parser.h \
+ src/output/spv/structure-xml-parser.h
+
+pspp_kludge_2=src/output/spv/liboutput_la-spv-light-decoder.lo
+$(pspp_kludge_2): src/output/spv/light-binary-parser.h
+
+pspp_kludge_3=src/output/spv/liboutput_la-spv-table-look.lo
+$(pspp_kludge_3): src/output/spv/tlo-parser.h