diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-15 17:27:06 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 17:28:34 +0200 |
| commit | 347e365c259d23b9b655c20e09ab622d70c74546 (patch) | |
| tree | 5da92e201fda67583d0203b67c624bf68b5ef34d /writerfilter | |
| parent | 778db525295267494493afa929de042cd642d99a (diff) | |
gnumake4: oox, writerfilter, CppunitTest.mk: adapt to changes in gnumake4 [hg:d0e98479a69a]
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/JunitTest_writerfilter_complex.mk | 5 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter_debug.mk | 4 | ||||
| -rw-r--r-- | writerfilter/Module_writerfilter.mk | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk index e716921683b1..129ba98e08a1 100644 --- a/writerfilter/JunitTest_writerfilter_complex.mk +++ b/writerfilter/JunitTest_writerfilter_complex.mk @@ -25,10 +25,9 @@ # #************************************************************************* -$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex)) +$(eval $(call gb_JunitTest_JunitTest,writerfilter_complex,SRCDIR)) -$(eval $(call gb_JunitTest_set_defs,writerfilter_complex,\ - $$(DEFS) \ +$(eval $(call gb_JunitTest_add_defs,writerfilter_complex,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/writerfilter/qa/complex/ooxml/testdocuments \ )) diff --git a/writerfilter/Library_writerfilter_debug.mk b/writerfilter/Library_writerfilter_debug.mk index ddf3eb700984..dabf1f98b346 100644 --- a/writerfilter/Library_writerfilter_debug.mk +++ b/writerfilter/Library_writerfilter_debug.mk @@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,writerfilter_debug,\ -I$(SRCDIR)/writerfilter/inc \ )) -$(eval $(call gb_Library_set_defs,writerfilter_debug,\ - $$(DEFS) \ -)) - $(eval $(call gb_Library_add_linked_libs,writerfilter_debug,\ writerfilter \ comphelper \ diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk index 0c2138c943a3..7b42985b6ebb 100644 --- a/writerfilter/Module_writerfilter.mk +++ b/writerfilter/Module_writerfilter.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Module_add_check_targets,writerfilter,\ CppunitTest_writerfilter_doctok \ )) -# does not run $(eval $(call gb_Module_add_subsequentcheck_targets,writerfilter,\ JunitTest_writerfilter_complex \ )) |