[Libreoffice-commits] .: Branch 'feature/gnumake4' - formula/Library_for.mk formula/Library_forui.mk

[Bjoern Michaelsen]

 formula/Library_for.mk   |    3 +--
 formula/Library_forui.mk |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 9019120d2792f2d4f8242c4701e3d97f3c8e9103
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jun 21 13:18:04 2011 +0200

    gnumake4: postmerge fixes in formula

diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index f1ac2c8..0477baf 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 0b77c70..5b849f9 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 \
 ))