summaryrefslogtreecommitdiff
path: root/sw/Library_sw.mk
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2011-02-02 17:05:04 +0100
committerMathias Bauer <mba@openoffice.org>2011-02-02 17:05:04 +0100
commitc3c1e664ee43c83937f82362e64296ec9d8018e6 (patch)
tree99efdc8da9ef87143fe59123918ce9dfbd655a05 /sw/Library_sw.mk
parent49912b6e927dd7ef85afdada97b61bff87fe9ead (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 'sw/Library_sw.mk')
-rw-r--r--sw/Library_sw.mk13
1 files changed, 2 insertions, 11 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 1bc351268f09..2781ef76814a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -81,7 +81,7 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
vcl \
vos3 \
xo \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,sw,\
@@ -727,15 +727,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/wrtsh/wrtundo \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,sw,\
- dl \
- m \
- pthread \
- sb \
-))
-endif
-
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,sw,\
@@ -756,10 +747,10 @@ endif
$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
-
$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/sdi \
$$(INCLUDE) \
))
+
# vim: set noet sw=4 ts=4: