[Libreoffice-commits] .: Branch 'feature/gnumake4' - cui/Library_cui.mk

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Tue Jun 21 06:25:38 PDT 2011


 cui/Library_cui.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit deacdbe43f5d3366b7c597f68a86a0169a803c83
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jun 21 15:25:26 2011 +0200

    gnumake4: postmerge fixes in cui

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6e3bf19..820e3da 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,cui,\
     -I$(OUTDIR)/inc/offuh \
 ))
 
-$(eval $(call gb_Library_set_defs,cui,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,cui,\
     $(if $(filter TRUE,$(ENABLE_GTK)),-DENABLE_GTK) \
     $(if $(filter TRUE,$(ENABLE_KDE)),-DENABLE_KDE) \
     $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \


More information about the Libreoffice-commits mailing list