diff options
author | Adrian Thurston <thurston@colm.net> | 2019-09-12 11:40:40 -0600 |
---|---|---|
committer | Adrian Thurston <thurston@colm.net> | 2019-09-12 11:40:40 -0600 |
commit | 903a1c125624990135162f84ea6a67c1df3954c3 (patch) | |
tree | 0cd93208abeff79a4e95301f7817b7b3238ba396 | |
parent | 29650a2d92a63b909a2d6fea677a24af6907e340 (diff) | |
download | colm-903a1c125624990135162f84ea6a67c1df3954c3.tar.gz |
put just one sedsubst in the root and use that in Makefiles
-rw-r--r-- | doc/ragel/Makefile.am | 2 | ||||
-rwxr-xr-x | sedsubst (renamed from test/colm.d/sedsubst) | 0 | ||||
-rw-r--r-- | test/Makefile.am | 4 | ||||
-rw-r--r-- | test/aapl.d/Makefile.am | 2 | ||||
-rw-r--r-- | test/colm.d/Makefile.am | 2 | ||||
-rw-r--r-- | test/ragel.d/Makefile.am | 2 | ||||
-rwxr-xr-x | test/sedsubst | 12 |
7 files changed, 6 insertions, 18 deletions
diff --git a/doc/ragel/Makefile.am b/doc/ragel/Makefile.am index 590a5572..926dfe27 100644 --- a/doc/ragel/Makefile.am +++ b/doc/ragel/Makefile.am @@ -33,7 +33,7 @@ EXTRA_DIST = ragel-guide.txt \ opstar.fig ragel.1: ragel.1.in - @$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST) + @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) if BUILD_MANUAL diff --git a/test/colm.d/sedsubst b/sedsubst index da01055e..da01055e 100755 --- a/test/colm.d/sedsubst +++ b/sedsubst diff --git a/test/Makefile.am b/test/Makefile.am index 285e9e93..0505c146 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = . aapl.d colm.d ragel.d rlhc.d rlparse.d trans.d noinst_SCRIPTS = subject.mk subject.sh subject.mk: subject.mk.in Makefile - @$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST) + @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) subject.sh: subject.sh.in Makefile - @$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST) + @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) diff --git a/test/aapl.d/Makefile.am b/test/aapl.d/Makefile.am index 89647c4b..e4e7eba9 100644 --- a/test/aapl.d/Makefile.am +++ b/test/aapl.d/Makefile.am @@ -59,7 +59,7 @@ test_string_SOURCES = test_string.cpp util.cpp test_rope_SOURCES = test_rope.cpp util.cpp gentests: gentests.sh Makefile - @$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST) + @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) #************************************* diff --git a/test/colm.d/Makefile.am b/test/colm.d/Makefile.am index a02a0778..45b93f13 100644 --- a/test/colm.d/Makefile.am +++ b/test/colm.d/Makefile.am @@ -1,4 +1,4 @@ noinst_SCRIPTS = gentests gentests: gentests.sh Makefile - @$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST) + @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) diff --git a/test/ragel.d/Makefile.am b/test/ragel.d/Makefile.am index 4c6bd1df..e5784f75 100644 --- a/test/ragel.d/Makefile.am +++ b/test/ragel.d/Makefile.am @@ -66,4 +66,4 @@ trans.c: trans.lm $(TRANS_DEPS) $(COLM) -c -b trans_object -I$(RAGEL_LM) -I../../ragel/host-go -o $@ $< gentests: gentests.sh Makefile - @$(top_srcdir)/test/sedsubst $< $@ -w,+x $(SED_SUBST) + @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) diff --git a/test/sedsubst b/test/sedsubst deleted file mode 100755 index da01055e..00000000 --- a/test/sedsubst +++ /dev/null @@ -1,12 +0,0 @@ -#/bin/sh -# - -source=$1 -output=$2 -mode=$3 -shift 3; - -echo "sedsubst: generating $output from $source" -test -f $output && rm -f $output -sed "$@" $source > $output -chmod $mode $output |