From e1c116ca35e79830173bcb3b91b17aaf360479fb Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 30 Sep 2013 17:28:14 -0700
Subject: Fix some build bugs in exotic configurations

---
 real.make         | 6 ++++--
 src/map/magic.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/real.make b/real.make
index f880889..f93640d 100644
--- a/real.make
+++ b/real.make
@@ -186,7 +186,9 @@ ifeq (${ENABLE_WARNINGS},yes)
 WARNINGS := -include ${SRC_DIR}/src/warnings.hpp
 endif
 ${GEN_DEPENDS} ${GEN_PREPROCESSED} ${GEN_IRS} ${GEN_BITCODES} ${GEN_ASSEMBLED} ${GEN_OBJECTS}: override WARNINGS :=
-${GEN_DEPENDS} ${GEN_PREPROCESSED} ${GEN_IRS} ${GEN_BITCODES} ${GEN_ASSEMBLED} ${GEN_OBJECTS}: override CPPFLAGS += -I ${SRC_DIR}/$(patsubst obj/%,src/%,${@D})
+# can't just override for generated objects,
+# because a generated header might be used for a non-generated object.
+override CPPFLAGS += -I ${SRC_DIR}/$(patsubst obj/%,src/%,${@D})
 
 # related to gdb bug 15801
 ifeq (${ENABLE_ABI6},yes)
@@ -239,7 +241,7 @@ obj/%.d: src/%.cpp
 	$(MKDIR_FIRST)
 	set -o pipefail; \
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} -MG -MP -MM $< \
-	    -MT '$@ $(patsubst %.d,%.o,$@)' \
+	    -MT '$(patsubst %.d,%.ii,$@) $(patsubst %.d,%.ll,$@) $(patsubst %.d,%.bc,$@) $(patsubst %.d,%.s,$@) $(patsubst %.d,%.o,$@) $@' \
 	    | sed -e ':again; s:/[^/ ]*/../:/:; t again' \
 	    -e 's: ${SRC_DIR}/: :g' \
 	    > $@
diff --git a/src/map/magic.cpp b/src/map/magic.cpp
index b6dc806..84d133a 100644
--- a/src/map/magic.cpp
+++ b/src/map/magic.cpp
@@ -9,7 +9,7 @@
 #include "magic-expr.hpp"
 #include "magic-interpreter-base.hpp"
 #include "magic-interpreter-lexer.hpp"
-#include "magic-interpreter-parser.hpp"
+#include "src/map/magic-interpreter-parser.hpp"
 #include "magic-stmt.hpp"
 #include "magic.hpp"
 
-- 
cgit v1.2.3-60-g2f50