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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/Library_svx.mk | 7 | ||||
| -rw-r--r-- | svx/Library_svxcore.mk | 10 | ||||
| -rw-r--r-- | svx/Library_textconversiondlgs.mk | 11 |
3 files changed, 3 insertions, 25 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 97cde827eb56..b549adeb9030 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -68,7 +68,7 @@ $(eval $(call gb_Library_add_linked_libs,svx,\ vos3 \ xo \ xcr \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,svx,\ @@ -218,11 +218,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/sendreportunx \ )) -$(eval $(call gb_Library_add_linked_libs,svx,\ - dl \ - m \ - pthread \ -)) else ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,svx,\ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 6e811cead2a9..5b7546d2d1c7 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -83,7 +83,7 @@ $(eval $(call gb_Library_add_linked_libs,svxcore,\ vcl \ vos3 \ xo \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,svxcore,\ @@ -448,14 +448,6 @@ $(eval $(call gb_Library_add_cxxobjects,svxcore,\ )) endif -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,svxcore,\ - dl \ - m \ - pthread \ -)) -endif - $(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) $(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 2e0880aced18..c2ddae4fe131 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ tl \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ @@ -63,13 +63,4 @@ $(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/resid \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ - dl \ - m \ - pthread \ - stl \ -)) -endif - # vim: set noet sw=4 ts=4: |