summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/CppunitTest_sw_filters_test.mk3
-rw-r--r--sw/CppunitTest_sw_layout_test.mk3
-rw-r--r--sw/CppunitTest_sw_macros_test.mk3
-rw-r--r--sw/CppunitTest_sw_regression_test.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_odfexport.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_odfimport.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_ooxmlexport.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_ooxmlimport.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_rtfexport.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_rtfimport.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_ww8export.mk3
-rw-r--r--sw/CppunitTest_sw_subsequent_ww8import.mk3
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk3
-rw-r--r--sw/Library_msword.mk3
-rw-r--r--sw/Library_sw.mk3
-rw-r--r--sw/Library_swd.mk3
-rw-r--r--sw/Library_swui.mk3
-rw-r--r--sw/Library_vbaswobj.mk3
18 files changed, 36 insertions, 18 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index 47d7a35e3075..53d990751bb5 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -56,9 +56,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_filters_test, \
cppuhelper \
sal \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 080bd6aeb1d7..ccbe8cd678ce 100644
--- a/sw/CppunitTest_sw_layout_test.mk
+++ b/sw/CppunitTest_sw_layout_test.mk
@@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
vcl \
xo \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 e42eb0c9276b..30915f2ae77f 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
vcl \
xo \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 538542b37ef7..69c10d366a67 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \
vcl \
xo \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 10e7ab20769f..03af297f98d9 100644
--- a/sw/CppunitTest_sw_subsequent_odfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfexport.mk
@@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \
utl \
vcl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 aceaa697b7e6..7d52f510aed5 100644
--- a/sw/CppunitTest_sw_subsequent_odfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_odfimport.mk
@@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \
vcl \
tl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 5a9587948a21..1523e5ca4f52 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk
@@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \
utl \
vcl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 8fc2dfedecaa..30d793c32c76 100644
--- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk
@@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \
sw \
vcl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 1609b6f41ffc..e9c721ec5611 100644
--- a/sw/CppunitTest_sw_subsequent_rtfexport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk
@@ -43,9 +43,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \
utl \
tl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 7ce087e36e40..6e9339e37a18 100644
--- a/sw/CppunitTest_sw_subsequent_rtfimport.mk
+++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk
@@ -44,9 +44,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \
vcl \
tl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 9f4677b5b29e..35a6af3814ce 100644
--- a/sw/CppunitTest_sw_subsequent_ww8export.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8export.mk
@@ -45,9 +45,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \
sw \
tl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 16c36843407a..f4bf71c30725 100644
--- a/sw/CppunitTest_sw_subsequent_ww8import.mk
+++ b/sw/CppunitTest_sw_subsequent_ww8import.mk
@@ -42,9 +42,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \
unotest \
sw \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 8b53bdf32009..268a620e9161 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -68,9 +68,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \
vcl \
xo \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 365c69096b96..f1f3a8c7a9b6 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,msword,\
utl \
vcl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 b58f71a72b3e..5dd22de249c2 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -77,9 +77,10 @@ $(eval $(call gb_Library_use_libraries,sw,\
vcl \
xo \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 73f5fb857781..780b069f4bfd 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -58,9 +58,10 @@ $(eval $(call gb_Library_use_libraries,swd,\
utl \
vcl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 4de06513c59a..040717b7900a 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -68,9 +68,10 @@ $(eval $(call gb_Library_use_libraries,swui,\
utl \
vcl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(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 310a90f4dbff..aeed2a85a0ff 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\
vbahelper \
vcl \
$(gb_UWINAPI) \
- $(gb_STDLIBS) \
))
+$(eval $(call gb_Library_add_standard_system_libs,vbaswobj))
+
$(eval $(call gb_Library_use_externals,vbaswobj,\
libxml2 \
))