From a2955eab660a8a6bf87e9d942fd09c61bf3df4d7 Mon Sep 17 00:00:00 2001
From: John Kerl <kerl.john.r@gmail.com>
Date: Mon, 21 Sep 2015 22:13:04 -0400
Subject: [PATCH] prepare for wiz autoconf merge

---
 Makefile => Makefile.no-autoconfig          |  6 +++---
 c/{Makefile => Makefile.no-autoconfig}      | 14 +++++++-------
 c/dsls/{Makefile => Makefile.no-autoconfig} |  0
 perf/{Makefile => Makefile.no-autoconfig}   |  0
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename Makefile => Makefile.no-autoconfig (83%)
 rename c/{Makefile => Makefile.no-autoconfig} (95%)
 rename c/dsls/{Makefile => Makefile.no-autoconfig} (100%)
 rename perf/{Makefile => Makefile.no-autoconfig} (100%)

diff --git a/Makefile b/Makefile.no-autoconfig
similarity index 83%
rename from Makefile
rename to Makefile.no-autoconfig
index 8c966e8e3..163ab6bc8 100644
--- a/Makefile
+++ b/Makefile.no-autoconfig
@@ -7,15 +7,15 @@ devall: c install doc
 # path to be picked up by the mlr-execs in the docs dir. better would be to
 # export PATH here with ./c at its head.
 c: .always
-	make -C c top
+	make -C c -f Makefile.no-autoconfig top
 doc: .always
 	cd doc && poki
 install: .always
-	make -C c install
+	make -C c -f Makefile.no-autoconfig install
 	install -d -m 0755 $(DESTDIR)/$(MANDIR)
 	install -m 0644 doc/miller.1 $(DESTDIR)/$(MANDIR)
 clean: .always
-	make -C c clean
+	make -C c -f Makefile.no-autoconfig clean
 .PHONY: manpage
 # OSX:
 # * brew install asciidoc
diff --git a/c/Makefile b/c/Makefile.no-autoconfig
similarity index 95%
rename from c/Makefile
rename to c/Makefile.no-autoconfig
index 2dfc0216f..d4f37d9cc 100644
--- a/c/Makefile
+++ b/c/Makefile.no-autoconfig
@@ -150,12 +150,12 @@ mlr.static: .always dsls
 	$(CCOPT) -static $(NON_DSL_SRCS) $(PDSL_OBJS) $(FDSL_OBJS) $(LFLAGS) -o mlr.static
 
 dsls: .always
-	make -C dsls put_dsl_parse.o
-	make -C dsls put_dsl_lexer.o
-	make -C dsls put_dsl_wrapper.o
-	make -C dsls filter_dsl_parse.o
-	make -C dsls filter_dsl_lexer.o
-	make -C dsls filter_dsl_wrapper.o
+	make -C dsls -f Makefile.no-autoconfig put_dsl_parse.o
+	make -C dsls -f Makefile.no-autoconfig put_dsl_lexer.o
+	make -C dsls -f Makefile.no-autoconfig put_dsl_wrapper.o
+	make -C dsls -f Makefile.no-autoconfig filter_dsl_parse.o
+	make -C dsls -f Makefile.no-autoconfig filter_dsl_lexer.o
+	make -C dsls -f Makefile.no-autoconfig filter_dsl_wrapper.o
 
 # ----------------------------------------------------------------
 # Other executable variants
@@ -248,7 +248,7 @@ getl: .always
 # ================================================================
 clean:
 	@rm -vf mlr mlrd mlrg mlrp tester
-	@make -C dsls clean
+	@make -C dsls -f Makefile.no-autoconfig clean
 perfclean profclean:
 	@rm -vf gmon.out perf.data perf.data.old
 .always:
diff --git a/c/dsls/Makefile b/c/dsls/Makefile.no-autoconfig
similarity index 100%
rename from c/dsls/Makefile
rename to c/dsls/Makefile.no-autoconfig
diff --git a/perf/Makefile b/perf/Makefile.no-autoconfig
similarity index 100%
rename from perf/Makefile
rename to perf/Makefile.no-autoconfig