[Libreoffice-commits] .: Branch 'feature/gnumake4' - forms/JunitTest_forms_complex.mk forms/JunitTest_forms_unoapi.mk forms/Library_frm.mk

[Bjoern Michaelsen]

 forms/JunitTest_forms_complex.mk |    2 +-
 forms/JunitTest_forms_unoapi.mk  |    2 +-
 forms/Library_frm.mk             |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit b416dc4b2b272ce7955ea477183db7da8b4e1c24
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jun 20 13:24:10 2011 +0200

    gnumake4: fix buildbreakers from merge

diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
index 9631879..420b051 100644
--- a/forms/JunitTest_forms_complex.mk
+++ b/forms/JunitTest_forms_complex.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,forms_complex))
+$(eval $(call gb_JunitTest_JunitTest,forms_complex, SRCDIR))
 
 $(eval $(call gb_JunitTest_add_jars,forms_complex,\
     $(OUTDIR)/bin/OOoRunner.jar \
diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk
index 931d8ae..68e2a00 100644
--- a/forms/JunitTest_forms_unoapi.mk
+++ b/forms/JunitTest_forms_unoapi.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JunitTest_JunitTest,forms_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,forms_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,forms_unoapi,\
     $$(DEFS) \
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 1208fa5..6804d61 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,frm,\
     $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
 ))
 
-$(eval $(call gb_Library_set_defs,frm,\
-    $$(DEFS) \
+$(eval $(call gb_Library_add_defs,frm,\
     $(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))