[Libreoffice-commits] .: 4 commits - binfilter/prj hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk hwpfilter/prj lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk oox/Library_oox.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk unoxml/prj writerfilter/Library_doctok.mk writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk

David Tardon dtardon at kemper.freedesktop.org
Sat Jun 18 02:33:16 PDT 2011 

 binfilter/prj/build.lst                                    |    2 +-
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk          |    6 +++++-
 hwpfilter/Library_hwp.mk                                   |    6 +++++-
 hwpfilter/prj/build.lst                                    |    2 +-
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |    6 +++++-
 lotuswordpro/Library_lwpft.mk                              |    6 +++++-
 oox/Library_oox.mk                                         |    6 +++++-
 unoxml/Library_unordf.mk                                   |    6 +++++-
 unoxml/Library_unoxml.mk                                   |    6 +++++-
 unoxml/prj/build.lst                                       |    2 +-
 writerfilter/Library_doctok.mk                             |    6 +++++-
 writerfilter/Library_ooxml.mk                              |    6 +++++-
 writerfilter/Library_resourcemodel.mk                      |    6 +++++-
 writerfilter/Library_writerfilter.mk                       |    6 +++++-
 writerfilter/Library_writerfilter_uno.mk                   |    6 +++++-
 15 files changed, 63 insertions(+), 15 deletions(-)

New commits:
commit 874a8e38cd6138026a3c88ba2cf1a1ad2a93f51c
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jun 17 20:28:16 2011 +0200

    use the new way of setting UNO API include dirs

diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 5e05328..02024b7 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -46,10 +46,14 @@ $(eval $(call gb_CppunitTest_add_linked_libs,hwpfilter_test_hwpfilter, \
 
 $(eval $(call gb_CppunitTest_set_include,hwpfilter_test_hwpfilter,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,hwpfilter_test_hwpfilter,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_CppunitTest_uses_ure,hwpfilter_test_hwpfilter))
 
 $(eval $(call gb_CppunitTest_add_type_rdbs,hwpfilter_test_hwpfilter,\
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index d6096a4..90685b1 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_add_precompiled_header,hwp,$(SRCDIR)/hwpfilter/inc/pch/
 $(eval $(call gb_Library_set_include,hwp,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/hwpfilter/inc/pch) \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,hwp,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,hwp,\
commit ee9dd949ce0dc3dbb5b5d0c2a31a43406d09db60
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 30 18:47:54 2011 +0200

    remove all traces of offuh from makefiles

diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 0def1a7..c9cb894 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -46,10 +46,14 @@ $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \
 
 $(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_CppunitTest_add_api,lotuswordpro_test_lotuswordpro,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro))
 
 $(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index db1cf58..988d101 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -30,7 +30,11 @@ $(eval $(call gb_Library_Library,lwpft))
 $(eval $(call gb_Library_set_include,lwpft,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,lwpft,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,lwpft,\
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 99bbdc6..282d845 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_add_package_headers,oox,\
 $(eval $(call gb_Library_set_include,oox,\
     $$(INCLUDE) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
     -I$(realpath $(SRCDIR)/oox/inc) \
     $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter -I%,$(OPENSSL_CFLAGS))) \
 ))
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,oox,\
     $(if $(filter YES,$(SYSTEM_OPENSSL)),$(filter-out -I%,$(OPENSSL_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,oox,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,oox,\
     basegfx \
     comphelper \
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 2e4afc5..95eb1fd 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,doctok,\
     -I$(WORKDIR)/writerfilter/inc/doctok \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
@@ -47,6 +46,11 @@ $(eval $(call gb_Library_set_defs,doctok,\
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,doctok,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,doctok,\
     cppu \
     cppuhelper \
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index e59c93a..e3d06ba 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,ooxml,\
     -I$(WORKDIR)/writerfilter/inc/ooxml \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
@@ -48,6 +47,11 @@ $(eval $(call gb_Library_set_defs,ooxml,\
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,ooxml,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,ooxml,\
     comphelper \
     cppu \
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index 1ee3c9e..04a1b36 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,resourcemodel,\
     -I$(WORKDIR)/writerfilter/inc \
     $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 include $(SRCDIR)/writerfilter/debug_setup.mk
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,resourcemodel,\
     $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,resourcemodel,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,resourcemodel,\
     comphelper \
     cppu \
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 3fe26f6..b976fae 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -32,7 +32,11 @@ $(eval $(call gb_Library_set_include,writerfilter,\
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,writerfilter,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 436cd3a..e6ba6c2 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_set_include,writerfilter_uno,\
     -I$(realpath $(SRCDIR)/writerfilter/inc) \
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,writerfilter_uno,\
@@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,writerfilter_uno,\
 	$(if $(filter YES,$(SYSTEM_LIBXML)),$(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,writerfilter_uno,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,writerfilter_uno,\
     comphelper \
     cppu \
commit e9e2a9bada1de2f54f594be2af5562362fb573c3
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon May 30 18:16:33 2011 +0200

    ause130: #i117218# missing pieces...

diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 2ca96df..7990c69 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -31,13 +31,17 @@ $(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf))
 
 $(eval $(call gb_Library_set_include,unordf,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,unordf,\
     $$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,unordf,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,unordf,\
     cppuhelper \
     cppu \
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 09070fe..907ee0f 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -31,13 +31,17 @@ $(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml))
 
 $(eval $(call gb_Library_set_include,unoxml,\
     $$(INCLUDE) \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,unoxml,\
     $$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,unoxml,\
+	udkapi \
+	offapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,unoxml,\
     ucbhelper \
     sax \
commit e6483d0bcb8cb06b164fda042c591238a1fdcca6
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon May 30 18:05:29 2011 +0200

    ause130: #i117218# change .idl handling to gnu make

diff --git a/binfilter/prj/build.lst b/binfilter/prj/build.lst
index 5a65841..739abba 100644
--- a/binfilter/prj/build.lst
+++ b/binfilter/prj/build.lst
@@ -1,4 +1,4 @@
-bf      binfilter : basic vcl xmlscript connectivity framework svtools offuh LIBXSLT:libxslt NULL
+bf      binfilter : basic vcl xmlscript connectivity framework svtools offapi LIBXSLT:libxslt NULL
 bf	binfilter											usr1	-	all	bf_mkout NULL
 bf	binfilter\bf_svtools\source\inc						get		-	all	bf_svt_sinc NULL
 bf  binfilter\bf_svtools\source\config					nmake	-	all bf_svt_config NULL
diff --git a/hwpfilter/prj/build.lst b/hwpfilter/prj/build.lst
index 3fa47f7..ea3f268 100644
--- a/hwpfilter/prj/build.lst
+++ b/hwpfilter/prj/build.lst
@@ -1,2 +1,2 @@
-hw	hwpfilter	:	offuh cppuhelper ZLIB:zlib LIBXSLT:libxslt ucbhelper ucb ure NULL
+hw	hwpfilter	:	offapi cppuhelper ZLIB:zlib LIBXSLT:libxslt ucbhelper ucb ure NULL
 hw	hwpfilter\prj	nmake	-	all	hw_prj NULL
diff --git a/unoxml/prj/build.lst b/unoxml/prj/build.lst
index 02f0482..97aed0f 100644
--- a/unoxml/prj/build.lst
+++ b/unoxml/prj/build.lst
@@ -1,2 +1,2 @@
-ux	unoxml	:	offuh cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
+ux	unoxml	:	offapi cppuhelper LIBXML2:libxml2 LIBXSLT:libxslt REDLAND:redland sax comphelper ucbhelper NULL
 ux	unoxml\prj    nmake	-	all ux_prj NULL

More information about the Libreoffice-commits mailing list