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 /dbaccess | |
parent | 2e677c39818f3a6479ac9103ac9c7e8ef985eeb0 (diff) |
gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs
Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/CppunitTest_dbaccess_macros_test.mk | 3 | ||||
-rw-r--r-- | dbaccess/Executable_odbcconfig.mk | 3 | ||||
-rw-r--r-- | dbaccess/Library_dba.mk | 3 | ||||
-rw-r--r-- | dbaccess/Library_dbaxml.mk | 3 | ||||
-rw-r--r-- | dbaccess/Library_dbmm.mk | 3 | ||||
-rw-r--r-- | dbaccess/Library_dbu.mk | 3 | ||||
-rw-r--r-- | dbaccess/Library_sdbt.mk | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk index 6a28adaf748f..06ac3147070c 100644 --- a/dbaccess/CppunitTest_dbaccess_macros_test.mk +++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk @@ -69,9 +69,10 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 fb4a0d87211a..809832fad7a3 100644 --- a/dbaccess/Executable_odbcconfig.mk +++ b/dbaccess/Executable_odbcconfig.mk @@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_sdk_api,odbcconfig)) $(eval $(call gb_Executable_use_libraries,odbcconfig,\ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 863bcbbaba5e..8ec7dcd47e35 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -64,9 +64,10 @@ $(eval $(call gb_Library_use_libraries,dba,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 0d38f503aa85..e9db12444e8d 100644 --- a/dbaccess/Library_dbaxml.mk +++ b/dbaccess/Library_dbaxml.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,dbaxml,\ vcl \ xo \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 89d9c0e83920..3da15cfea101 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,dbmm,\ vcl \ xmlscript \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 7e0fe1cfaa15..579deb6618ba 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -71,9 +71,10 @@ $(eval $(call gb_Library_use_libraries,dbu,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbu)) + ifeq ($(GUI),WNT) $(eval $(call gb_Library_use_libraries,dbu,\ ole32 \ diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index ee61c037f875..306b9ec99075 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,sdbt,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ |