diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-27 00:49:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:06 +0200 |
| commit | b85c34978356eb01311f197f00f4dd5f808e3664 (patch) | |
| tree | 7bd759b1b780bb0433609e18736fc6a6816ac19f /writerfilter | |
| parent | gbuild: split uwinapi out of gb_STDLIBS (diff) | |
| download | core-b85c34978356eb01311f197f00f4dd5f808e3664.tar.gz core-b85c34978356eb01311f197f00f4dd5f808e3664.zip | |
gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs
Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_doctok.mk | 3 | ||||
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 3 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 3 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter_uno.mk | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index cf48c49851cf..b5b8e7e928b8 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -38,9 +38,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_doctok, \ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_doctok)) + $(eval $(call gb_CppunitTest_set_include,writerfilter_doctok,\ $$(INCLUDE) \ -I$(SRCDIR)/writerfilter/inc \ diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 78f2a008abc6..a50d72151a30 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ vcl \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,writerfilter_rtftok)) + $(eval $(call gb_CppunitTest_use_api,writerfilter_rtftok,\ offapi \ udkapi \ diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 83006badc658..5429ea7af4c6 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -81,9 +81,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter)) + $(eval $(call gb_Library_use_external,writerfilter,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk index d7a72fc4c0c8..bc0bd83c9205 100644 --- a/writerfilter/Library_writerfilter_uno.mk +++ b/writerfilter/Library_writerfilter_uno.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter_uno,\ sal \ writerfilter \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,writerfilter_uno)) + $(eval $(call gb_Library_use_external,writerfilter_uno,libxml2)) $(eval $(call gb_Library_add_exception_objects,writerfilter_uno,\ |