summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2011-12-01 19:02:57 +0100
committerEike Rathke <erack@redhat.com>2011-12-01 21:04:29 +0100
commitb20ea84970fb8b3068880a361822941c47f50edd (patch)
tree71be2d18549e79dbbba0dfee1f1ad85369be4f69
parent2578d13ea8bf7b3918e392a3fabca7ba2fec3146 (diff)
pull in module headers before solver
-rw-r--r--tools/Executable_rscdep.mk4
-rw-r--r--tools/Library_tl.mk5
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 085c48edaf7b..4fe9da2d2d22 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -29,9 +29,9 @@
$(eval $(call gb_Executable_Executable,rscdep))
$(eval $(call gb_Executable_set_include,rscdep,\
- $$(INCLUDE) \
- -I$(realpath $(SRCDIR)/tools/inc) \
-I$(realpath $(SRCDIR)/tools/bootstrp) \
+ -I$(realpath $(SRCDIR)/tools/inc) \
+ $$(INCLUDE) \
))
$(eval $(call gb_Executable_add_defs,rscdep,\
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 1ef1ea4bc5ad..5f1f7a30b8a4 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -32,10 +32,9 @@ $(eval $(call gb_Library_add_package_headers,tl,tools_inc))
$(eval $(call gb_Library_add_package_headers,tl,tools_reversemap))
$(eval $(call gb_Library_set_include,tl,\
- $$(INCLUDE) \
-I$(realpath $(SRCDIR)/tools/inc) \
- -I$(SRCDIR)/solenv/inc \
-I$(WORKDIR)/CustomTarget/tools/source/reversemap \
+ $$(INCLUDE) \
))
$(eval $(call gb_Library_add_defs,tl,\
@@ -128,8 +127,8 @@ $(eval $(call gb_Library_use_external,tl,zlib))
ifeq ($(OS),WNT)
$(eval $(call gb_Library_set_include,tl,\
- $$(INCLUDE) \
-I$(realpath $(SRCDIR)/tools/win/inc) \
+ $$(INCLUDE) \
))
$(eval $(call gb_Library_add_exception_objects,tl,\