diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-21 16:17:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-06-21 16:17:24 +0200 |
| commit | 59d25adbde48f123bf5a39bbbb9c27ff085f34b4 (patch) | |
| tree | c80803ccbe3b8d9253354f67cd6942dcc1b35e03 | |
| parent | 0e211a1c963efbe4e6e85ed6315982087432341b (diff) | |
CWS gnumake2: pch for debug builds, fixing header package deps
| -rw-r--r-- | framework/prj/target_lib_fwe.mk | 8 | ||||
| -rw-r--r-- | framework/prj/target_lib_fwi.mk | 6 | ||||
| -rw-r--r-- | framework/prj/target_lib_fwk.mk | 4 | ||||
| -rw-r--r-- | framework/prj/target_lib_fwl.mk | 6 | ||||
| -rw-r--r-- | framework/prj/target_lib_fwm.mk | 8 |
5 files changed, 12 insertions, 20 deletions
diff --git a/framework/prj/target_lib_fwe.mk b/framework/prj/target_lib_fwe.mk index 1cd47b05cb..718e9c38ea 100644 --- a/framework/prj/target_lib_fwe.mk +++ b/framework/prj/target_lib_fwe.mk @@ -27,14 +27,12 @@ $(eval $(call gb_Library_Library,fwe)) -$(eval $(call gb_Library_add_package_headers,fwe,framework_inc)) - $(eval $(call gb_Library_set_include,fwe,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/framework/ \ - -I$(SRCDIR)/framework/inc \ -I$(SRCDIR)/framework/inc/pch \ -I$(SRCDIR)/framework/source/inc \ + -I$(SRCDIR)/framework/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/framework \ -I$(OUTDIR)/inc/offuh \ )) diff --git a/framework/prj/target_lib_fwi.mk b/framework/prj/target_lib_fwi.mk index 1d53d9b1ab..0e00df9d83 100644 --- a/framework/prj/target_lib_fwi.mk +++ b/framework/prj/target_lib_fwi.mk @@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_defs,fwi,\ )) $(eval $(call gb_Library_set_include,fwi,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/framework/ \ - -I$(SRCDIR)/framework/inc \ -I$(SRCDIR)/framework/inc/pch \ -I$(SRCDIR)/framework/source/inc \ + -I$(SRCDIR)/framework/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/framework \ -I$(OUTDIR)/inc/offuh \ )) diff --git a/framework/prj/target_lib_fwk.mk b/framework/prj/target_lib_fwk.mk index 37b5fbcb58..8ff8adb4e5 100644 --- a/framework/prj/target_lib_fwk.mk +++ b/framework/prj/target_lib_fwk.mk @@ -27,14 +27,12 @@ $(eval $(call gb_Library_Library,fwk)) -$(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,\ - -I$(SRCDIR)/framework/inc \ -I$(SRCDIR)/framework/inc/pch \ -I$(SRCDIR)/framework/source/inc \ + -I$(SRCDIR)/framework/inc \ -I$(WORKDIR)/inc/framework/ \ $$(INCLUDE) \ -I$(OUTDIR)/inc/framework \ diff --git a/framework/prj/target_lib_fwl.mk b/framework/prj/target_lib_fwl.mk index a43ab95444..f3ec59fd6c 100644 --- a/framework/prj/target_lib_fwl.mk +++ b/framework/prj/target_lib_fwl.mk @@ -27,14 +27,12 @@ $(eval $(call gb_Library_Library,fwl)) -$(eval $(call gb_Library_add_package_headers,fwl,framework_inc)) - $(eval $(call gb_Library_set_include,fwl,\ - $$(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_fwm.mk b/framework/prj/target_lib_fwm.mk index 0c84ab2de2..56a6a9f74f 100644 --- a/framework/prj/target_lib_fwm.mk +++ b/framework/prj/target_lib_fwm.mk @@ -27,14 +27,12 @@ $(eval $(call gb_Library_Library,fwm)) -$(eval $(call gb_Library_add_package_headers,fwm,framework_inc)) - $(eval $(call gb_Library_set_include,fwm,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/framework/ \ - -I$(SRCDIR)/framework/inc \ -I$(SRCDIR)/framework/inc/pch \ + -I$(SRCDIR)/framework/inc \ -I$(SRCDIR)/framework/source/inc \ + -I$(WORKDIR)/inc/framework/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/framework \ -I$(OUTDIR)/inc/offuh \ )) |