diff options
author | Adrian Thurston <thurston@colm.net> | 2019-09-12 18:38:05 -0600 |
---|---|---|
committer | Adrian Thurston <thurston@colm.net> | 2019-09-12 18:38:05 -0600 |
commit | 2f7331772690af0f9fb189d735c04ad7263f489b (patch) | |
tree | af78580237f677d01d461f6782d37be92eefcf7b | |
parent | 1da8143524bf2ae3898d94db950475ccbe3b5763 (diff) | |
download | colm-2f7331772690af0f9fb189d735c04ad7263f489b.tar.gz |
removed the building vars COLM_, they don't change
Just specifying these directly in the Makefile.am files.
-rw-r--r-- | configure.ac | 18 | ||||
-rw-r--r-- | ragel/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-asm/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-c/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-crack/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-csharp/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-d/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-go/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-java/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-js/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-julia/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-ocaml/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-ruby/Makefile.am | 8 | ||||
-rw-r--r-- | ragel/host-rust/Makefile.am | 8 | ||||
-rw-r--r-- | test/ragel.d/Makefile.am | 4 |
15 files changed, 54 insertions, 72 deletions
diff --git a/configure.ac b/configure.ac index c1f4eb62..e1882839 100644 --- a/configure.ac +++ b/configure.ac @@ -156,24 +156,6 @@ dnl AM_CONDITIONAL([BUILD_MANUAL], [test "x$build_manual" = "xyes"]) AC_CANONICAL_HOST() AM_CONDITIONAL([LINKER_NO_UNDEFINED], [test "x$host_os" = "xlinux-gnu"]) -# -# For building within the tree. -# -COLM_BIN='$(top_srcdir)/colm/colm' -COLM_LA='$(top_srcdir)/colm/libcolm.la' -COLM_LIBDEP="${COLM_LA}" -COLM_BINDEP="${COLM}" - -SED_SUBST="$SED_SUBST -e 's|@COLM_BIN@|${COLM_BIN}|g'" -SED_SUBST="$SED_SUBST -e 's|@COLM_LA@|${COLM_LA}|g'" -SED_SUBST="$SED_SUBST -e 's|@COLM_LIBDEP@|${COLM_LIBDEP}|g'" -SED_SUBST="$SED_SUBST -e 's|@COLM_BINDEP@|${COLM_BINDEP}|g'" - -AC_SUBST(COLM_BIN) -AC_SUBST(COLM_LA) -AC_SUBST(COLM_LIBDEP) -AC_SUBST(COLM_BINDEP) - dnl dnl Testing dnl diff --git a/ragel/Makefile.am b/ragel/Makefile.am index b16a0397..05177575 100644 --- a/ragel/Makefile.am +++ b/ragel/Makefile.am @@ -1,10 +1,10 @@ SUBDIRS = . host-ruby host-asm host-julia host-ocaml host-c \ host-d host-csharp host-go host-java host-rust host-crack host-js -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../colm/colm +COLM_LA = ../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) KELBT = @KELBT@ RAGEL = @RAGEL@ diff --git a/ragel/host-asm/Makefile.am b/ragel/host-asm/Makefile.am index 9a9a77bb..43ba13ac 100644 --- a/ragel/host-asm/Makefile.am +++ b/ragel/host-asm/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-asm diff --git a/ragel/host-c/Makefile.am b/ragel/host-c/Makefile.am index 46962848..48ada92b 100644 --- a/ragel/host-c/Makefile.am +++ b/ragel/host-c/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-c diff --git a/ragel/host-crack/Makefile.am b/ragel/host-crack/Makefile.am index 69164bfe..c9794f02 100644 --- a/ragel/host-crack/Makefile.am +++ b/ragel/host-crack/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-crack diff --git a/ragel/host-csharp/Makefile.am b/ragel/host-csharp/Makefile.am index 332dfba4..80d27dc8 100644 --- a/ragel/host-csharp/Makefile.am +++ b/ragel/host-csharp/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-csharp diff --git a/ragel/host-d/Makefile.am b/ragel/host-d/Makefile.am index 3fee70b0..b73d4b48 100644 --- a/ragel/host-d/Makefile.am +++ b/ragel/host-d/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-d diff --git a/ragel/host-go/Makefile.am b/ragel/host-go/Makefile.am index 35d98c5c..62b2489b 100644 --- a/ragel/host-go/Makefile.am +++ b/ragel/host-go/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-go diff --git a/ragel/host-java/Makefile.am b/ragel/host-java/Makefile.am index 47a8d9ce..b39d5826 100644 --- a/ragel/host-java/Makefile.am +++ b/ragel/host-java/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-java diff --git a/ragel/host-js/Makefile.am b/ragel/host-js/Makefile.am index 5a8384f6..0b621411 100644 --- a/ragel/host-js/Makefile.am +++ b/ragel/host-js/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-js diff --git a/ragel/host-julia/Makefile.am b/ragel/host-julia/Makefile.am index 267b184a..a8b4cf68 100644 --- a/ragel/host-julia/Makefile.am +++ b/ragel/host-julia/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-julia diff --git a/ragel/host-ocaml/Makefile.am b/ragel/host-ocaml/Makefile.am index 31acb568..73e29697 100644 --- a/ragel/host-ocaml/Makefile.am +++ b/ragel/host-ocaml/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-ocaml diff --git a/ragel/host-ruby/Makefile.am b/ragel/host-ruby/Makefile.am index d4dae7d7..6a89400c 100644 --- a/ragel/host-ruby/Makefile.am +++ b/ragel/host-ruby/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-ruby diff --git a/ragel/host-rust/Makefile.am b/ragel/host-rust/Makefile.am index 96c076f5..39645e83 100644 --- a/ragel/host-rust/Makefile.am +++ b/ragel/host-rust/Makefile.am @@ -1,7 +1,7 @@ -COLM_BIN = @COLM_BIN@ -COLM_LA = @COLM_LA@ -COLM_LIBDEP = @COLM_LIBDEP@ -COLM_BINDEP = @COLM_BINDEP@ +COLM_BIN = ../../colm/colm +COLM_LA = ../../colm/libcolm.la +COLM_LIBDEP = $(COLM_LA) +COLM_BINDEP = $(COLM_BIN) bin_PROGRAMS = ragel-rust diff --git a/test/ragel.d/Makefile.am b/test/ragel.d/Makefile.am index e5784f75..e092af12 100644 --- a/test/ragel.d/Makefile.am +++ b/test/ragel.d/Makefile.am @@ -18,7 +18,7 @@ # along with Ragel; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -COLM = ../../colm/colm +COLM_BIN = ../../colm/colm RAGEL_LM = ../../ragel COLM_xCPPFLAGS = -I../../colm/include @@ -63,7 +63,7 @@ trans_LDADD = -lcolm trans_LDFLAGS = $(COLM_xLDFLAGS) trans.c: trans.lm $(TRANS_DEPS) - $(COLM) -c -b trans_object -I$(RAGEL_LM) -I../../ragel/host-go -o $@ $< + $(COLM_BIN) -c -b trans_object -I$(RAGEL_LM) -I../../ragel/host-go -o $@ $< gentests: gentests.sh Makefile @$(top_srcdir)/sedsubst $< $@ -w,+x $(SED_SUBST) |