diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:10 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:10 +0200 |
| commit | 37a773d8970274cd1b34ac4fd78b34c96e717d8c (patch) | |
| tree | 67885e9337ad109a6f308bcbeceba1cb882100e4 /forms | |
| parent | e2682561337c521f10fa2c87594c86c01b3c662a (diff) | |
gnumake4: fix buildbreakers from merge
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/JunitTest_forms_complex.mk | 2 | ||||
| -rw-r--r-- | forms/JunitTest_forms_unoapi.mk | 2 | ||||
| -rw-r--r-- | forms/Library_frm.mk | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk index 963187922833..420b051a582b 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 931d8aecfeb1..68e2a00167ae 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 1208fa5c5d0c..6804d6195853 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))) \ )) |