X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fspv%2Fautomake.mk;h=01f8a334a9d58e72f10301c5ace53463a377324b;hb=2720633be76a46488e05bb9a0d45f24a89375065;hp=cda806b4a78681a1a5cf0114f0841eae8aa38808;hpb=50f6ea7d66d03895020891215fb4f55bbf061003;p=pspp

diff --git a/src/output/spv/automake.mk b/src/output/spv/automake.mk
index cda806b4a7..01f8a334a9 100644
--- a/src/output/spv/automake.mk
+++ b/src/output/spv/automake.mk
@@ -1,19 +1,19 @@
 # PSPP - a program for statistical analysis.
-# Copyright (C) 2017 Free Software Foundation, Inc.
-# 
+# Copyright (C) 2019, 2020 Free Software Foundation, Inc.
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-# 
+#
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 src_output_liboutput_la_SOURCES += \
@@ -30,6 +30,8 @@ src_output_liboutput_la_SOURCES += \
 	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 \
@@ -39,6 +41,8 @@ src_output_liboutput_la_SOURCES += \
 	src/output/spv/spvxml-helpers.c \
 	src/output/spv/spvxml-helpers.h
 
+AM_CPPFLAGS += -Isrc
+
 light_binary_in = \
 	src/output/spv/binary-parser-generator \
 	src/output/spv/light-binary.grammar
@@ -46,10 +50,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)$(PYTHON) $^ 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)$(PYTHON) $^ header spvlb > $@.tmp && mv $@.tmp $@
 nodist_src_output_liboutput_la_SOURCES += $(light_binary_out)
 BUILT_SOURCES += $(light_binary_out)
 CLEANFILES += $(light_binary_out)
@@ -62,10 +66,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)$(PYTHON) $^ 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)$(PYTHON) $^ header spvob > $@.tmp && mv $@.tmp $@
 nodist_src_output_liboutput_la_SOURCES += $(old_binary_out)
 BUILT_SOURCES += $(old_binary_out)
 CLEANFILES += $(old_binary_out)
@@ -78,10 +82,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)$(PYTHON) $^ 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)$(PYTHON) $^ header spvdx > $@.tmp && mv $@.tmp $@
 nodist_src_output_liboutput_la_SOURCES += $(detail_xml_out)
 BUILT_SOURCES += $(detail_xml_out)
 CLEANFILES += $(detail_xml_out)
@@ -94,11 +98,27 @@ 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)$(PYTHON) $^ 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)$(PYTHON) $^ 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)$(PYTHON) $^ code tlo '"output/spv/tlo-parser.h"' > $@.tmp
+	$(AM_V_at)mv $@.tmp $@
+src/output/spv/tlo-parser.h: $(tlo_in)
+	$(AM_V_GEN)$(PYTHON) $^ header tlo > $@.tmp && mv $@.tmp $@
+nodist_src_output_liboutput_la_SOURCES += $(tlo_out)
+BUILT_SOURCES += $(tlo_out)
+CLEANFILES += $(tlo_out)
+EXTRA_DIST += $(tlo_in)