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
commit9019120d2792f2d4f8242c4701e3d97f3c8e9103 (patch)
treebc6ed816f0861c2a054dd3c9cafe13e0ba07f9c5 /formula
parent57e9e0908d664bcf082a6d68faf39e1c95a0c274 (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 f1ac2c82fd..0477baf0c6 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 0b77c702e9..5b849f97c4 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 \
))