diff --git a/Makefile b/Makefile index 5b604e986..b1e11e97c 100644 --- a/Makefile +++ b/Makefile @@ -141,13 +141,10 @@ doctest: latexdoc texdoc doc: (cd mathics/doc/latex && $(MAKE) doc) -#: Build JSON ASCII to unicode opcode tables -mathics/data/op-tables.json: +#: Build JSON ASCII to unicode opcode table and operator table +mathics/data/op-tables.json mathics/data/operators.json: $(BASH) ./admin-tools/make-op-tables.sh -#: Build JSON ASCII to operator tables -mathics/data/operators.json: - $(BASH) ./admin-tools/make-operator-tables.sh #: Remove ChangeLog rmChangeLog: diff --git a/admin-tools/make-op-tables.sh b/admin-tools/make-op-tables.sh index 03c1d0a5d..33c54766d 100755 --- a/admin-tools/make-op-tables.sh +++ b/admin-tools/make-op-tables.sh @@ -12,3 +12,4 @@ mathics3-generate-json-table \ --field=operator-to-ascii \ --field=operator-to-unicode \ -o op-tables.json +mathics3-generate-operator-json-table -o operator-tables.json diff --git a/admin-tools/make-operator-tables.sh b/admin-tools/make-operator-tables.sh deleted file mode 100755 index 9ebc6afbf..000000000 --- a/admin-tools/make-operator-tables.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# Create ASCII operator to Unicode tables -bs=${BASH_SOURCE[0]} -mydir=$(dirname $bs) -PYTHON=${PYTHON:-python} - -cd $mydir/../mathics/data -mathics3-generate-operator-json-table -o operator-tables.json