summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-09-28 16:29:24 +0200
committerMichael Stahl <mstahl@redhat.com>2012-09-28 16:49:08 +0200
commit5032dc0fc339ba6b200e80a5482cc86e00662a0b (patch)
tree6ecb751f6fd25a7ee5f66434b10928423d1e05f7 /sw
parent7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 (diff)
gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
Diffstat (limited to 'sw')
-rw-r--r--sw/CppunitTest_sw_filters_test.mk2
-rw-r--r--sw/CppunitTest_sw_layout_test.mk2
-rw-r--r--sw/CppunitTest_sw_macros_test.mk2
-rw-r--r--sw/CppunitTest_sw_regression_test.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_odfexport.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_odfimport.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_ooxmlexport.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_ooxmlimport.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_rtfexport.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_rtfimport.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_ww8export.mk2
-rw-r--r--sw/CppunitTest_sw_subsequent_ww8import.mk2
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk2
-rw-r--r--sw/Library_msword.mk2
-rw-r--r--sw/Library_sw.mk2
-rw-r--r--sw/Library_swd.mk2
-rw-r--r--sw/Library_swui.mk2
-rw-r--r--sw/Library_vbaswobj.mk2
18 files changed, 0 insertions, 36 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 53d990751bb5..7b0d48fa14b4 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -58,8 +58,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_filters_test))
-
$(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc \
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
index ccbe8cd678ce..af54e0af27da 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -69,8 +69,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_layout_test))
-
$(eval $(call gb_CppunitTest_set_include,sw_layout_test,\
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc \
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 30915f2ae77f..a321a29935e2 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_macros_test))
-
$(eval $(call gb_CppunitTest_set_include,sw_macros_test,\
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc \
diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk
index 69c10d366a67..32d2bdb46c55 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_regression_test))
-
$(eval $(call gb_CppunitTest_set_include,sw_regression_test,\
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc \
diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk
index 03af297f98d9..4ba12b90b0db 100644
--- a/sw/CppunitTest_sw_subsequent_odfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfexport.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfexport))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk
index 7d52f510aed5..9c9a1560d5ca 100644
--- a/sw/CppunitTest_sw_subsequent_odfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfimport.mk
@@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_odfimport))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
index 1523e5ca4f52..588349cad511 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
@@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlexport))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
index 30d793c32c76..d8b9bc428383 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ooxmlimport))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk
index e9c721ec5611..bd45fad4bb34 100644
--- a/sw/CppunitTest_sw_subsequent_rtfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfexport))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk
index 6e9339e37a18..062ef8dd87f7 100644
--- a/sw/CppunitTest_sw_subsequent_rtfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk
@@ -46,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_rtfimport))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk
index 35a6af3814ce..5fccb5d848a1 100644
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8export))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk
index f4bf71c30725..c00f966ae7d8 100644
--- a/sw/CppunitTest_sw_subsequent_ww8import.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8import.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_subsequent_ww8import))
-
$(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\
libxml2 \
))
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 268a620e9161..f25b9691aa21 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -70,8 +70,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sw_swdoc_test))
-
$(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\
icuuc \
libxml2 \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index f1f3a8c7a9b6..cba74d917d2e 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,msword,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,msword))
-
$(eval $(call gb_Library_use_externals,msword,\
icuuc \
libxml2 \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 5dd22de249c2..ba3fcb23c2af 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -79,8 +79,6 @@ $(eval $(call gb_Library_use_libraries,sw,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,sw))
-
$(eval $(call gb_Library_use_externals,sw,\
icuuc \
libxml2 \
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 780b069f4bfd..856efac25051 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -60,8 +60,6 @@ $(eval $(call gb_Library_use_libraries,swd,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,swd))
-
$(eval $(call gb_Library_add_exception_objects,swd,\
sw/source/filter/basflt/iodetect \
sw/source/ui/uno/detreg \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 040717b7900a..eaa68dac9404 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -70,8 +70,6 @@ $(eval $(call gb_Library_use_libraries,swui,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,swui))
-
$(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/chrdlg/break \
sw/source/ui/chrdlg/chardlg \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index aeed2a85a0ff..7f593ec04b18 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,vbaswobj))
-
$(eval $(call gb_Library_use_externals,vbaswobj,\
libxml2 \
))