From 455fb7e1b9e48e4de2d8949ae4b9db9154583c0a Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Wed, 31 Oct 2012 17:22:30 -0700
Subject: [PATCH] scripts: Don't automatically run configure script on make.

---
 Makefile             | 13 +++++++------
 README.build         |  9 ++++-----
 scripts/Makefile     | 21 ++++++++++-----------
 scripts/config-funcs |  2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index d253caf..3509870 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
 ###############################################################################
 
+include scripts/colors
+
 SUBDIRS=nonlib FL timeline mixer session-manager sequencer
 
+.config: configure
+	@ echo $(BOLD)$(YELLOW)Hey! You need to run 'configure' first.
+	@ echo If that fails because of NTK stuff, then you need to run 'make ntk' first.$(SGR0)
+	@ exit 1
+
 all: .config
 	@ echo '!!! If you have any trouble here try reading README.build !!!'
 	@ for dir in $(SUBDIRS); do echo Building $$dir; $(MAKE) -s -C $$dir; done
@@ -31,12 +38,6 @@ lib/ntk/configure:
 lib/.built: 
 	@ make -C lib
 
-.config: configure
-	./configure
-
-config: configure
-	./configure
-
 clean:
 	@ for dir in $(SUBDIRS); do $(MAKE) -s -C $$dir clean; done
 
diff --git a/README.build b/README.build
index 1eee8f2..c3f7276 100644
--- a/README.build
+++ b/README.build
@@ -6,8 +6,7 @@ you *MUST* begin by typing:
 
     make ntk
 
-Then, to build everything else, just type 'make'. Stuff will
-happen. Eventually, you'll have to answer some build questions. Just
-answer them. Don't make things harder on yourself by trying to build
-everything individually. Just type 'make'. I'm serious. It's that
-simple.
\ No newline at end of file
+Then, run './configure' (use the '-i' option if you want to interactively
+configure) Then, to build everything else, just type 'make'. Stuff will happen.
+Don't make things harder on yourself by trying to build everything individually. Just
+type 'make'. I'm serious. It's that simple.
diff --git a/scripts/Makefile b/scripts/Makefile
index ac2b9aa..5a916bd 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -23,16 +23,15 @@
 ## Do not edit this file; run `make config` instead.
 ##
 
-
-all: .config
+include scripts/colors
 
 .config: configure
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
-config:
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
+	@ echo $(BOLD)$(YELLOW)Hey! You need to run 'configure' first.$(SGR0)
+	@ exit 1
+#config:
+#	@ echo '<<< Configuring '$(PACKAGE)
+#	@ ./configure
+	
 
 -include .config
 
@@ -76,9 +75,6 @@ CFLAGS+=-DVERSION=\"$(VERSION)\" \
 CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
 
 
-
-include scripts/colors
-
 SPACE:="
`tput cuf 20`"
 
 ifneq ($(CALCULATING),yes)
@@ -126,3 +122,6 @@ scan-gpl:
 	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
 
 -include .deps
+
+all: .config
+
diff --git a/scripts/config-funcs b/scripts/config-funcs
index 20d6bbb..92da239 100644
--- a/scripts/config-funcs
+++ b/scripts/config-funcs
@@ -246,7 +246,7 @@ append ()
 
 end ()
 {
-    info "Configuration complete"
+    info "Configuration complete. You may now run 'make'"
     touch .config
 }