Author: ydario
Date: Thu Feb 16 14:41:48 2012
New Revision: 1244999

URL: http://svn.apache.org/viewvc?rev=1244999&view=rev
Log:
i118923 - OS/2 port: cppunit is no longer broken.

Modified:
    incubator/ooo/trunk/main/basebmp/test/makefile.mk
    incubator/ooo/trunk/main/basegfx/test/makefile.mk
    incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk

Modified: incubator/ooo/trunk/main/basebmp/test/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basebmp/test/makefile.mk?rev=1244999&r1=1244998&r2=1244999&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basebmp/test/makefile.mk (original)
+++ incubator/ooo/trunk/main/basebmp/test/makefile.mk Thu Feb 16 14:41:48 2012
@@ -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"

Modified: incubator/ooo/trunk/main/basegfx/test/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basegfx/test/makefile.mk?rev=1244999&r1=1244998&r2=1244999&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basegfx/test/makefile.mk (original)
+++ incubator/ooo/trunk/main/basegfx/test/makefile.mk Thu Feb 16 14:41:48 2012
@@ -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

Modified: incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk?rev=1244999&r1=1244998&r2=1244999&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk (original)
+++ incubator/ooo/trunk/main/sax/qa/cppunit/makefile.mk Thu Feb 16 14:41:48 2012
@@ -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