summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2011-05-30 18:08:50 +0200
committerDavid Tardon <dtardon@redhat.com>2011-06-17 16:41:08 +0200
commit246efa0d481c4b3bb55c1f53d954557cc027c008 (patch)
tree76742dc66aaa690f9588450e590a6694f391ba00 /framework
parent3c822ccbf013b2c9129cbb4717890114bfdd06ee (diff)
ause130: #i117218# change .idl handling to gnu make
Diffstat (limited to 'framework')
-rw-r--r--framework/Library_fwe.mk6
-rw-r--r--framework/Library_fwi.mk6
-rw-r--r--framework/Library_fwk.mk6
-rw-r--r--framework/Library_fwl.mk6
-rw-r--r--framework/Library_fwm.mk6
5 files changed, 25 insertions, 5 deletions
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 6c87f86d1542..b69a3a7e33e4 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,fwe,\
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,fwe,\
@@ -42,6 +41,11 @@ $(eval $(call gb_Library_set_defs,fwe,\
-DFWE_DLLIMPLEMENTATION\
))
+$(eval $(call gb_Library_add_api,fwe,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,fwe,\
comphelper \
cppu \
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 3a8c75941eea..681bd93a4b10 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -34,6 +34,11 @@ $(eval $(call gb_Library_set_defs,fwi,\
-DFWI_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,fwi,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,fwi,\
-I$(realpath $(SRCDIR)/framework/inc/pch) \
-I$(realpath $(SRCDIR)/framework/source/inc) \
@@ -41,7 +46,6 @@ $(eval $(call gb_Library_set_include,fwi,\
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_linked_libs,fwi,\
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index f999b751b43b..804048c16d1d 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -38,7 +38,11 @@ $(eval $(call gb_Library_set_include,fwk,\
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,fwk,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,fwk,\
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index 8c925653dc63..dd1d79eccc64 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -36,7 +36,11 @@ $(eval $(call gb_Library_set_include,fwl,\
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,fwl,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,fwl,\
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index d540079c0f51..063c78e8fa00 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -36,7 +36,11 @@ $(eval $(call gb_Library_set_include,fwm,\
-I$(WORKDIR)/inc/framework/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/framework \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,fwm,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,fwm,\