From caae1e38d0d239f4f7088a64526fe1d2f6587999 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 26 Sep 2013 23:55:29 -0700
Subject: Split string header into pieces

---
 real.make | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'real.make')

diff --git a/real.make b/real.make
index f93640d..e04d98e 100644
--- a/real.make
+++ b/real.make
@@ -67,7 +67,7 @@
 # 10. Support per-target build flags? (requires renaming)
 
 ifeq ($(findstring s,$(firstword ${MAKEFLAGS})),)
-ifeq (${MAKE_RESTARTS},)
+ifndef MAKE_RESTARTS
 # TODO: should I write this in tengwar?
 # The major problem is that it's usually encoded in the PUA
 # and thus requires a font specification.
@@ -237,6 +237,8 @@ distclean: clean
 %.cpp %.hpp: %.ypp
 	$(MKDIR_FIRST)
 	${BISON} -d -o $*.cpp $<
+ifndef MAKE_RESTARTS
+# prevent errors if missing header
 obj/%.d: src/%.cpp
 	$(MKDIR_FIRST)
 	set -o pipefail; \
@@ -245,6 +247,7 @@ obj/%.d: src/%.cpp
 	    | sed -e ':again; s:/[^/ ]*/../:/:; t again' \
 	    -e 's: ${SRC_DIR}/: :g' \
 	    > $@
+endif
 # the above SRC_DIR replacement is not really safe, but it works okayish.
 obj/%.ii: src/%.cpp
 	$(MKDIR_FIRST)
@@ -308,8 +311,8 @@ tags: ${SOURCES} ${HEADERS}
 	ctags --totals --c-kinds=+px -f $@ $^
 
 Makefile: ${SRC_DIR}/Makefile.in
-	@echo Makefile.in updated, you must rerun configure
-	@false
+	@echo Makefile.in updated, reconfiguring ...
+	./config.status
 
 include ${SRC_DIR}/version.make
 
-- 
cgit v1.2.3-70-g09d2