[Libreoffice-commits] .: 3 commits - starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Library_smd.mk starmath/Library_sm.mk sw/CppunitTest_sw_swdoc_test.mk sw/CppunitTest_sw_test_filters.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk
David Tardon
dtardon at kemper.freedesktop.org
Sat Jun 18 02:35:46 PDT 2011
starmath/CppunitTest_starmath_qa_cppunit.mk | 6 +++++-
starmath/Library_sm.mk | 6 +++++-
starmath/Library_smd.mk | 6 +++++-
sw/CppunitTest_sw_swdoc_test.mk | 6 +++++-
sw/CppunitTest_sw_test_filters.mk | 6 +++++-
sw/Library_msword.mk | 6 +++++-
sw/Library_sw.mk | 6 +++++-
sw/Library_swd.mk | 6 +++++-
sw/Library_swui.mk | 6 +++++-
sw/Library_vbaswobj.mk | 7 ++++++-
10 files changed, 51 insertions(+), 10 deletions(-)
New commits:
commit 87e96440b0be0dbb1c15d146ae8465c76460e5b1
Author: David Tardon <dtardon at redhat.com>
Date: Sat Jun 18 07:04:45 2011 +0200
use the new way of setting UNO API include dirs
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 9953cea..636ca29 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -76,10 +76,14 @@ $(eval $(call gb_CppunitTest_set_include,sw_swdoc_test,\
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_CppunitTest_add_api,sw_swdoc_test,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test))
$(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\
diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk
index 15b3f7a..6fe972f 100644
--- a/sw/CppunitTest_sw_test_filters.mk
+++ b/sw/CppunitTest_sw_test_filters.mk
@@ -57,10 +57,14 @@ $(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(realpath $(SRCDIR)/sw/inc) \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_CppunitTest_add_api,sw_filters_test,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_CppunitTest_uses_ure,sw_filters_test))
$(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
commit d0a033f64776f222fd03708f5b0b5dc41ab5f25a
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 30 18:48:02 2011 +0200
remove all traces of offuh from makefiles
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 0f4606a..5d22f83 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -32,7 +32,11 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\
-I$(realpath $(SRCDIR)/starmath/inc) \
-I$(realpath $(SRCDIR)/starmath/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_CppunitTest_add_api,starmath_qa_cppunit,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_CppunitTest_set_defs,starmath_qa_cppunit,\
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index bd492df..8bed8a5 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,sm,\
-I$(WORKDIR)/SdiTarget/starmath/sdi \
-I$(WORKDIR)/Misc/starmath/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,sm,\
-DSC_INFO_OSVERSION=\"$(OS)\" \
))
+$(eval $(call gb_Library_add_api,sm,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,sm,\
comphelper \
cppu \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 538f921..4889413 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Library_set_include,smd,\
-I$(realpath $(SRCDIR)/starmath/inc) \
-I$(WORKDIR)/Misc/sm/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
@@ -38,6 +37,11 @@ $(eval $(call gb_Library_set_defs,smd,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,smd,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,smd,\
cppu \
cppuhelper \
commit 5aa668859b6a94fdf1a600eb603714a94e54ee83
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon May 30 18:14:44 2011 +0200
ause130: #i117218# change .idl handling to gnu make
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index 9c41a56..00870e3 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -39,10 +39,14 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/sw \
))
+$(eval $(call gb_Library_add_api,msword,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_defs,msword,\
$$(DEFS) \
))
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index f3e5371..82ea9aa 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -43,10 +43,14 @@ $(eval $(call gb_Library_set_include,sw,\
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,sw,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_defs,sw,\
$$(DEFS) \
-DSW_DLLIMPLEMENTATION \
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 0b1ca39..b155983 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -38,7 +38,11 @@ $(eval $(call gb_Library_set_include,swd,\
-I$(realpath $(SRCDIR)/sw/source/core/inc) \
-I$(realpath $(SRCDIR)/sw/source/filter/inc) \
-I$(realpath $(SRCDIR)/sw/source/ui/inc) \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,swd,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_set_defs,swd,\
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 0b5c708..2cdf1b5 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -36,13 +36,17 @@ $(eval $(call gb_Library_set_include,swui,\
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_set_defs,swui,\
$$(DEFS) \
))
+$(eval $(call gb_Library_add_api,swui,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,swui,\
comphelper \
cppu \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index d76781e..70874eb 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -37,10 +37,15 @@ $(eval $(call gb_Library_set_include,vbaswobj,\
-I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/ \
))
+$(eval $(call gb_Library_add_api,vbaswobj,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
comphelper \
cppu \
More information about the Libreoffice-commits
mailing list