summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chart2/Library_chartcontroller.mk6
-rw-r--r--chart2/Library_chartmodel.mk6
-rw-r--r--chart2/Library_charttools.mk6
-rw-r--r--chart2/Library_chartview.mk6
-rw-r--r--sc/CppunitTest_sc_ucalc.mk6
-rw-r--r--sc/Library_sc.mk6
-rw-r--r--sc/Library_scd.mk6
-rw-r--r--sc/Library_scfilt.mk6
-rw-r--r--sc/Library_scui.mk6
-rw-r--r--sc/Library_vbaobj.mk6
10 files changed, 50 insertions, 10 deletions
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index b717c2ddadee..090d3ea893e1 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
-I$(realpath $(SRCDIR)/chart2/source/controller/inc) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,chartcontroller,\
+ offapi \
+ udkapi \
))
# TODO: is this still necessary?
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index cf258737e1bc..e9ac4553fea1 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -35,7 +35,11 @@ $(eval $(call gb_Library_set_include,chartmodel,\
-I$(realpath $(SRCDIR)/chart2/source/model/inc) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,chartmodel,\
+ offapi \
+ udkapi \
))
# TODO: is this still necessary?
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 2bf40ca05750..9eac6390876c 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,charttools,\
-I$(realpath $(SRCDIR)/chart2/inc/pch) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,charttools,\
@@ -42,6 +41,11 @@ $(eval $(call gb_Library_set_defs,charttools,\
-DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
))
+$(eval $(call gb_Library_add_api,charttools,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,charttools,\
basegfx \
comphelper \
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 802a13d40728..9fc0e50adfed 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,chartview,\
-I$(realpath $(SRCDIR)/chart2/source/view/inc) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,chartview,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,chartview,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
+$(eval $(call gb_Library_add_api,chartview,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,chartview,\
basegfx \
charttools \
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index ec8db65901f8..26b483bfb13a 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -71,10 +71,14 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
-I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(realpath $(SRCDIR)/sc/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_CppunitTest_add_api,sc_ucalc,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc))
$(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 5e9375398d9e..3b82fd0a6856 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,sc,\
-I$(WORKDIR)/SdiTarget/sc/sdi \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,sc,\
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,sc,\
-DSC_INFO_OSVERSION=\"$(OS)\" \
))
+$(eval $(call gb_Library_add_api,sc,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,sc,\
avmedia \
basegfx \
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 0331df2f9733..5b4aa8446190 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -30,13 +30,17 @@ $(eval $(call gb_Library_set_include,scd,\
-I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,scd,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,scd,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,scd,\
cppu \
cppuhelper \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index edcfd7ce11ad..04e6dba9eabe 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(realpath $(SRCDIR)/sc/inc/pch) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
@@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,scfilt,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,scfilt,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,scfilt,\
basegfx \
comphelper \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c85de9f15584..ce806b4ef74b 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -30,13 +30,17 @@ $(eval $(call gb_Library_set_include,scui,\
-I$(WORKDIR)/SdiTarget/sc/sdi \
-I$(WORKDIR)/Misc/sc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,scui,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,scui,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,scui,\
comphelper \
cppu \
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 6ef54b386626..3c3b5414b541 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\
-I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/ \
))
@@ -40,6 +39,11 @@ $(eval $(call gb_Library_set_defs,vbaobj,\
-DVBA_OOBUILD_HACK \
))
+$(eval $(call gb_Library_add_api,vbaobj,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,vbaobj,\
comphelper \
cppu \