diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-02 17:05:04 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-02 17:05:04 +0100 |
| commit | ab451ff91e394a5f756558a9b27b39b55c43f075 (patch) | |
| tree | 3734ff13290f921c824b452ce8d71ef3c836d368 /sfx2 | |
| parent | a204d0906ddf7498cf6bc0acbae4ac949f1a1af6 (diff) | |
CWS gnumake3: rename gb_StdLibs -> gb_STDLIBS; remove explicit linking of individual standard libs from makefiles; fix export problem in framework
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/CppunitTest_sfx2_metadatable.mk | 2 | ||||
| -rwxr-xr-x | sfx2/Library_qstart.mk | 7 | ||||
| -rwxr-xr-x | sfx2/Library_sfx.mk | 9 |
3 files changed, 2 insertions, 16 deletions
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index d2a31b624d0d..67d5a7f43869 100755 --- a/sfx2/CppunitTest_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -35,7 +35,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ sal \ sfx \ stl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 2843524b1dc1..2344d79746c4 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -78,13 +78,6 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ sfx \ )) -$(eval $(call gb_Library_add_linked_system_libs,qstart_gtk,\ - dl \ - icuuc \ - m \ - pthread \ -)) - $(eval $(call gb_Library_add_exception_objects,qstart_gtk,\ sfx2/source/appl/shutdowniconunx \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 9ce73f2369ef..4cfd5da93bb6 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -76,14 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ vcl \ vos3 \ xml2 \ - $(gb_StdLibs) \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,sfx,\ - icuuc \ - dl \ - m \ - pthread \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sfx,\ |