summaryrefslogtreecommitdiff
path: root/dbaccess
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 /dbaccess
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 'dbaccess')
-rw-r--r--dbaccess/CppunitTest_dbaccess_macros_test.mk2
-rw-r--r--dbaccess/Executable_odbcconfig.mk2
-rw-r--r--dbaccess/Library_dba.mk2
-rw-r--r--dbaccess/Library_dbaxml.mk2
-rw-r--r--dbaccess/Library_dbmm.mk2
-rw-r--r--dbaccess/Library_dbu.mk2
-rw-r--r--dbaccess/Library_sdbt.mk2
7 files changed, 0 insertions, 14 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 06ac3147070c..4db6c7183576 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -71,8 +71,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_add_standard_system_libs,dbaccess_macros_test))
-
$(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\
-I$(SRCDIR)/sc/source/ui/inc \
-I$(SRCDIR)/sc/inc \
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 809832fad7a3..0bc3e0da4bb4 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -40,8 +40,6 @@ $(eval $(call gb_Executable_use_libraries,odbcconfig,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Executable_add_standard_system_libs,odbcconfig))
-
$(eval $(call gb_Executable_add_exception_objects,odbcconfig,\
dbaccess/win32/source/odbcconfig/odbcconfig \
))
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 8ec7dcd47e35..40a075ea10a3 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_libraries,dba,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,dba))
-
$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba))
$(eval $(call gb_Library_add_exception_objects,dba,\
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index e9db12444e8d..821852218459 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,dbaxml))
-
$(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml))
$(eval $(call gb_Library_add_exception_objects,dbaxml,\
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 3da15cfea101..dd0a73b9b179 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,dbmm,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,dbmm))
-
$(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm))
$(eval $(call gb_Library_add_exception_objects,dbmm,\
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 8d35b1f3da53..f63efabcbdce 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -73,8 +73,6 @@ $(eval $(call gb_Library_use_libraries,dbu,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,dbu))
-
ifeq ($(GUI),WNT)
$(eval $(call gb_Library_use_system_win32_libs,dbu,\
ole32 \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 306b9ec99075..cc80dca441d5 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,sdbt,\
$(gb_UWINAPI) \
))
-$(eval $(call gb_Library_add_standard_system_libs,sdbt))
-
$(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt))
$(eval $(call gb_Library_add_exception_objects,sdbt,\