diff options
| author | sb <sb@openoffice.org> | 2010-09-10 11:13:28 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-10 11:13:28 +0200 |
| commit | 48637b9bcfd300d7d0f9ee2956b1f0a7c8e07668 (patch) | |
| tree | f0e0ec3a4f9032330df468a567c5c5f6f72d2932 /smoketestoo_native/makefile.mk | |
| parent | d5a7d1139d5995c1e6c051aab5e985125fa66c98 (diff) | |
| parent | 04873f78c8cd0594d1beaabe50f8cb38135eb665 (diff) | |
sb123: merged in DEV300_m87
Diffstat (limited to 'smoketestoo_native/makefile.mk')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index ec0d6be313c8..18f3a42b789f 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -33,6 +33,13 @@ ENABLE_EXCEPTIONS = TRUE CFLAGSCXX += $(CPPUNIT_CFLAGS) +#building with stlport, but cppunit was not built with stlport +.IF "$(USE_SYSTEM_STL)"!="YES" +.IF "$(SYSTEM_CPPUNIT)"=="YES" +CFLAGSCXX+=-DADAPT_EXT_STL +.ENDIF +.ENDIF + SLOFILES = $(SHL1OBJS) SHL1TARGET = smoketest @@ -47,14 +54,11 @@ DEF1NAME = $(SHL1TARGET) ALLTAR : cpptest -cpptest : $(SHL1TARGETN) $(BIN)/smoketestdoc.sxw +cpptest : $(SHL1TARGETN) TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw CPPTEST_LIBRARY = $(SHL1TARGETN) -$(BIN)/smoketestdoc.sxw: data/smoketestdoc.sxw - $(COPY) $< $@ - .IF "$(OS)" != "WNT" $(installationtest_instpath).flag : $(shell ls \ $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz) |