summaryrefslogtreecommitdiff
path: root/framework/prj
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-06-18 19:03:40 +0200
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-06-18 19:03:40 +0200
commitb25e198437049b3db6d70a4fb81713fd937b6f5a (patch)
tree067d590e58d85f0be91252d9c5240287b9537fd9 /framework/prj
parent137b283deb31f38a25d9996dc1a0c2057d39998a (diff)
CWS gnumake2: enabling precompiled headers where possible
Diffstat (limited to 'framework/prj')
-rw-r--r--framework/prj/target_lib_fwe.mk2
-rw-r--r--framework/prj/target_lib_fwi.mk2
-rw-r--r--framework/prj/target_lib_fwk.mk8
-rw-r--r--framework/prj/target_lib_fwl.mk2
-rw-r--r--framework/prj/target_lib_fwm.mk2
5 files changed, 9 insertions, 7 deletions
diff --git a/framework/prj/target_lib_fwe.mk b/framework/prj/target_lib_fwe.mk
index 9387cad85a67..1cd47b05cb24 100644
--- a/framework/prj/target_lib_fwe.mk
+++ b/framework/prj/target_lib_fwe.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,fwe))
-$(call gb_Library_get_headers_target,fwe) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwe,framework_inc))
$(eval $(call gb_Library_set_include,fwe,\
$$(INCLUDE) \
diff --git a/framework/prj/target_lib_fwi.mk b/framework/prj/target_lib_fwi.mk
index 0c1d9a63fedf..1d53d9b1ab6e 100644
--- a/framework/prj/target_lib_fwi.mk
+++ b/framework/prj/target_lib_fwi.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,fwi))
-$(call gb_Library_get_headers_target,fwi) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
$(eval $(call gb_Library_set_defs,fwi,\
$$(DEFS) \
diff --git a/framework/prj/target_lib_fwk.mk b/framework/prj/target_lib_fwk.mk
index 272f57e7df36..37b5fbcb586e 100644
--- a/framework/prj/target_lib_fwk.mk
+++ b/framework/prj/target_lib_fwk.mk
@@ -27,14 +27,16 @@
$(eval $(call gb_Library_Library,fwk))
-$(call gb_Library_get_headers_target,fwk) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwk,framework_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,fwk,$(SRCDIR)/framework/inc/pch/precompiled_framework))
$(eval $(call gb_Library_set_include,fwk,\
- $$(INCLUDE) \
- -I$(WORKDIR)/inc/framework/ \
-I$(SRCDIR)/framework/inc \
-I$(SRCDIR)/framework/inc/pch \
-I$(SRCDIR)/framework/source/inc \
+ -I$(WORKDIR)/inc/framework/ \
+ $$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
-I$(OUTDIR)/inc/offuh \
))
diff --git a/framework/prj/target_lib_fwl.mk b/framework/prj/target_lib_fwl.mk
index 8e549041cae3..a43ab9544493 100644
--- a/framework/prj/target_lib_fwl.mk
+++ b/framework/prj/target_lib_fwl.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,fwl))
-$(call gb_Library_get_headers_target,fwl) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwl,framework_inc))
$(eval $(call gb_Library_set_include,fwl,\
$$(INCLUDE) \
diff --git a/framework/prj/target_lib_fwm.mk b/framework/prj/target_lib_fwm.mk
index e0b4df3ef2c8..0c84ab2de2a4 100644
--- a/framework/prj/target_lib_fwm.mk
+++ b/framework/prj/target_lib_fwm.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,fwm))
-$(call gb_Library_get_headers_target,fwm) : $(call gb_Package_get_target,framework_inc)
+$(eval $(call gb_Library_add_package_headers,fwm,framework_inc))
$(eval $(call gb_Library_set_include,fwm,\
$$(INCLUDE) \