summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 13:18:04 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-21 13:18:04 +0200
commit1565f386d49dce8e3370e999123ad7b292357770 (patch)
tree912eb54a1cb777c2d1d1a342012bd76a2e2cba99 /formula
parent5cba588ff2e3a97317f9e4fb004ef99bcda6f577 (diff)
gnumake4: postmerge fixes in formula
Diffstat (limited to 'formula')
-rw-r--r--formula/Library_for.mk3
-rw-r--r--formula/Library_forui.mk3
2 files changed, 2 insertions, 4 deletions
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index f1ac2c82fdbe..0477baf0c65e 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -41,8 +41,7 @@ $(eval $(call gb_Library_set_include,for,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,for,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,for,\
-DFORMULA_DLLIMPLEMENTATION \
))
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 0b77c702e9d4..5b849f97c4e4 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,forui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,forui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,forui,\
-DFORMULA_DLLIMPLEMENTATION \
))