diff options
| -rw-r--r-- | basebmp/test/makefile.mk | 8 | ||||
| -rw-r--r-- | basegfx/test/makefile.mk | 10 | ||||
| -rw-r--r-- | sax/qa/cppunit/makefile.mk | 10 |
3 files changed, 8 insertions, 20 deletions
diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk index 0b28dca7506a..ec94b28d4daa 100644 --- a/basebmp/test/makefile.mk +++ b/basebmp/test/makefile.mk @@ -29,14 +29,10 @@ TARGETTYPE=GUI ENABLE_EXCEPTIONS=TRUE -.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" @all: -.IF "$(GUI)" == "OS2" - @echo "Skipping, cppunit broken." -.ELIF "$(WITH_CPPUNIT)" != "YES" @echo "cppunit disabled. nothing do do." -.END .ELSE @@ -138,4 +134,4 @@ SLOFILES=$(SHL1OBJS) .INCLUDE : _cppunit.mk .ENDIF -.ENDIF # "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk index 43fa9b401afa..402b820a2741 100644 --- a/basegfx/test/makefile.mk +++ b/basegfx/test/makefile.mk @@ -32,16 +32,12 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" @all: -.IF "$(GUI)" == "OS2" - @echo "Skipping, cppunit broken." -.ELIF "$(WITH_CPPUNIT)" != "YES" @echo "cppunit disabled. nothing do do." -.END -.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ELSE # "$(WITH_CPPUNIT)" != "YES" #building with stlport, but cppunit was not built with stlport .IF "$(USE_SYSTEM_STL)"!="YES" @@ -86,7 +82,7 @@ SLOFILES=$(SHL1OBJS) # --- Targets ------------------------------------------------------ -.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" .INCLUDE : target.mk .INCLUDE : _cppunit.mk diff --git a/sax/qa/cppunit/makefile.mk b/sax/qa/cppunit/makefile.mk index 27c5089d23ed..2c0233f09810 100644 --- a/sax/qa/cppunit/makefile.mk +++ b/sax/qa/cppunit/makefile.mk @@ -31,16 +31,12 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.IF "$(WITH_CPPUNIT)" != "YES" @all: -.IF "$(GUI)" == "OS2" - @echo "Skipping, cppunit broken." -.ELIF "$(WITH_CPPUNIT)" != "YES" @echo "cppunit disabled. nothing do do." -.END -.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ELSE # "$(WITH_CPPUNIT)" != "YES" #building with stlport, but cppunit was not built with stlport .IF "$(USE_SYSTEM_STL)"!="YES" @@ -80,7 +76,7 @@ SLOFILES= \ # --- Targets ------------------------------------------------------ -.ENDIF # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" +.ENDIF # "$(WITH_CPPUNIT)" != "YES" .INCLUDE : target.mk .INCLUDE : _cppunit.mk |