diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-27 00:49:12 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-01 13:54:24 +0200 |
| commit | 816ec4b0933e36ac468230365359c3b9d8d52986 (patch) | |
| tree | 29101399a8df306f55614e48979f342f7ce0dff9 /tools | |
| parent | 6f6f7a17dc82248446dc4eddfd51af08362fc352 (diff) | |
gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs
Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CppunitTest_tools_test.mk | 3 | ||||
| -rw-r--r-- | tools/Executable_bestreversemap.mk | 3 | ||||
| -rw-r--r-- | tools/Executable_mkunroll.mk | 3 | ||||
| -rw-r--r-- | tools/Executable_rscdep.mk | 3 | ||||
| -rw-r--r-- | tools/Executable_so_checksum.mk | 3 | ||||
| -rw-r--r-- | tools/Library_tl.mk | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index ba876eab4a8c..6fce0cdcbf4a 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -47,9 +47,10 @@ $(eval $(call gb_CppunitTest_use_libraries,tools_test, \ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_CppunitTest_add_standard_system_libs,tools_test)) + $(eval $(call gb_CppunitTest_use_static_libraries,tools_test, \ ooopathutils \ )) diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk index a30b5e5e0fe2..5fae14f4f6e4 100644 --- a/tools/Executable_bestreversemap.mk +++ b/tools/Executable_bestreversemap.mk @@ -29,9 +29,10 @@ $(eval $(call gb_Executable_set_include,bestreversemap,\ $(eval $(call gb_Executable_use_libraries,bestreversemap,\ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,bestreversemap)) + $(eval $(call gb_Executable_add_exception_objects,bestreversemap,\ tools/source/reversemap/bestreversemap \ )) diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk index e97405bec6dc..c92e01296759 100644 --- a/tools/Executable_mkunroll.mk +++ b/tools/Executable_mkunroll.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,mkunroll,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,mkunroll)) + $(eval $(call gb_Executable_add_exception_objects,mkunroll,\ tools/bootstrp/mkunroll/mkunroll \ )) diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk index 12635cd3a7b5..b408da57beb4 100644 --- a/tools/Executable_rscdep.mk +++ b/tools/Executable_rscdep.mk @@ -30,9 +30,10 @@ $(eval $(call gb_Executable_use_libraries,rscdep,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Executable_add_standard_system_libs,rscdep)) + $(eval $(call gb_Executable_use_sdk_api,rscdep)) $(eval $(call gb_Executable_add_exception_objects,rscdep,\ diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk index 260607035582..c7cfd90e695a 100644 --- a/tools/Executable_so_checksum.mk +++ b/tools/Executable_so_checksum.mk @@ -29,10 +29,11 @@ $(eval $(call gb_Executable_use_libraries,so_checksum,\ sal \ tl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) # used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial +$(eval $(call gb_Executable_add_standard_system_libs,so_checksum)) + $(eval $(call gb_Executable_add_exception_objects,so_checksum,\ tools/bootstrp/md5 \ tools/bootstrp/so_checksum \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index b588874d04ca..3981bac35735 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tl,\ cppu \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tl)) + $(eval $(call gb_Library_add_exception_objects,tl,\ tools/source/datetime/datetime \ |