mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnumake4: fix buildbreakers from merge

Browse Source
This commit is contained in:
Bjoern Michaelsen
2011-06-20 13:24:10 +02:00
parent e268256133
commit 37a773d897
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forms/JunitTest_forms_complex.mk
View File

@@ -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 \

2
forms/JunitTest_forms_unoapi.mk
View File

@@ -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) \

3
forms/Library_frm.mk
View File

@@ -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))) \
))