summaryrefslogtreecommitdiff
path: root/sd
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 /sd
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 'sd')
-rw-r--r--sd/CppunitTest_sd_filters_test.mk2
-rw-r--r--sd/CppunitTest_sd_regression_test.mk2
-rw-r--r--sd/CppunitTest_sd_uimpress.mk2
-rw-r--r--sd/Library_sd.mk2
-rw-r--r--sd/Library_sdd.mk2
-rw-r--r--sd/Library_sdfilt.mk2
-rw-r--r--sd/Library_sdui.mk2
7 files changed, 0 insertions, 14 deletions
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 1d9f6fb297ce..f5fc02664e14 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -73,8 +73,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_filters_test))
-
$(eval $(call gb_CppunitTest_set_include,sd_filters_test,\
-I$(SRCDIR)/sd/source/ui/inc \
-I$(SRCDIR)/sd/inc \
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index 85ea7eb91f1b..abee99bf17de 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -68,8 +68,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_regression_test))
-
$(eval $(call gb_CppunitTest_set_include,sd_regression_test,\
-I$(SRCDIR)/sd/source/ui/inc \
-I$(SRCDIR)/sd/inc \
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 4d175957c35a..03453fff113c 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -74,8 +74,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress))
-
ifeq ($(OS),WNT)
$(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\
ws2_32 \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index d8dd7c095133..05a7baf7c9d1 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -106,8 +106,6 @@ $(eval $(call gb_Library_use_libraries,sd,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,sd))
-
$(eval $(call gb_Library_use_externals,sd,\
libxml2 \
dbus \
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index c668637a588c..f0c23cd51c49 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,sdd,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,sdd))
-
$(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd))
$(eval $(call gb_Library_add_exception_objects,sdd,\
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index b0b0d967731e..1c4c152bc4b6 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -68,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,sdfilt))
-
$(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt))
$(eval $(call gb_Library_add_exception_objects,sdfilt,\
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 7949f732e34e..98c1fe96c573 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -67,8 +67,6 @@ $(eval $(call gb_Library_use_libraries,sdui,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,sdui))
-
$(eval $(call gb_Library_add_exception_objects,sdui,\
sd/source/filter/html/htmlattr \
sd/source/filter/html/pubdlg \