summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-06-01 17:28:33 +0200
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-06-01 17:28:33 +0200
commitb726828067fc122fcae94d09cf6ac61f6b2b9e4d (patch)
treecb4d2db4d2d247ec8d3ca093e4272907f64f86ab
parenta2aabff823450be2c531059f8d8c5d56adcf375a (diff)
CWS gnumake2: fitting sdi into the workdir structure
-rw-r--r--sfx2/prj/target_lib_sfx2.mk7
-rw-r--r--svx/prj/target_lib_svxcore.mk5
2 files changed, 5 insertions, 7 deletions
diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk
index d9b8c52e37..952fb9ce05 100644
--- a/sfx2/prj/target_lib_sfx2.mk
+++ b/sfx2/prj/target_lib_sfx2.mk
@@ -35,14 +35,13 @@ $(eval $(call gb_Library_add_package_headers,sfx,\
$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots))
$(eval $(call gb_Library_set_include,sfx,\
- $$(INCLUDE) \
- -I$(WORKDIR)/inc/sfx2/sdi \
- -I$(WORKDIR)/inc/sfx2 \
- -I$(WORKDIR)/inc/ \
-I$(SRCDIR)/sfx2/inc \
-I$(SRCDIR)/sfx2/inc/sfx2 \
-I$(SRCDIR)/sfx2/source/inc \
-I$(SRCDIR)/sfx2/inc/pch \
+ -I$(WORKDIR)/SdiTarget/sfx2/sdi \
+ -I$(WORKDIR)/inc/ \
+ $$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
$(LIBXML_CFLAGS) \
diff --git a/svx/prj/target_lib_svxcore.mk b/svx/prj/target_lib_svxcore.mk
index d268c7e91f..f337588232 100644
--- a/svx/prj/target_lib_svxcore.mk
+++ b/svx/prj/target_lib_svxcore.mk
@@ -30,14 +30,13 @@ $(eval $(call gb_Library_Library,svxcore))
$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
$(eval $(call gb_Library_set_include,svxcore,\
- $$(SOLARINC) \
- -I$(WORKDIR)/inc/svx/ \
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/inc/pch \
+ -I$(WORKDIR)/SdiTarget/svx/sdi \
+ $$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
- -I$(WORKDIR)/inc/svx/sdi \
))
$(eval $(call gb_Library_set_defs,svxcore,\