summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2011-04-13 16:11:41 +0000
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 14:24:10 +0200
commit43971a5399c8c261b3b2554b023717216b0b4319 (patch)
tree30b77b2a86ebbccff510aa86a67ea420d5010bbb
parent49a5636500a72613769e3bc0637cd02e59fde3c5 (diff)
gnumake4: #i116959#: kill gb_LinkTarget_set_{defs,cflags,cxxflags,objcxxflags} [hg:389f5e8ec8cd]
-rw-r--r--starmath/Library_sm.mk4
-rw-r--r--starmath/Library_smd.mk4
-rw-r--r--sw/Library_msword.mk4
-rw-r--r--sw/Library_sw.mk3
-rw-r--r--sw/Library_swd.mk4
-rw-r--r--sw/Library_swui.mk4
6 files changed, 1 insertions, 22 deletions
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index be2fecfd4c26..78648e025bd4 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -42,10 +42,6 @@ $(eval $(call gb_Library_set_include,sm,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,sm,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,sm,\
comphelper \
cppu \
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index ae2dde0e69f1..5ea8fda11738 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Library_set_include,smd,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,smd,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,smd,\
cppu \
cppuhelper \
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index b47fe49aede2..b59967db2930 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -42,10 +42,6 @@ $(eval $(call gb_Library_set_include,msword,\
-I$(OUTDIR)/inc/sw \
))
-$(eval $(call gb_Library_set_defs,msword,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,msword,\
basegfx \
comphelper \
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 4dde29a98c49..caffa1357e22 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -46,8 +46,7 @@ $(eval $(call gb_Library_set_include,sw,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,sw,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sw,\
-DSW_DLLIMPLEMENTATION \
))
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index a0dcfaf29c3a..67898f996bed 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -41,10 +41,6 @@ $(eval $(call gb_Library_set_include,swd,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swd,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,swd,\
comphelper \
cppu \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index f7b3f529c80f..9701339798a8 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -39,10 +39,6 @@ $(eval $(call gb_Library_set_include,swui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swui,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,swui,\
comphelper \
cppu \