diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-11-13 02:19:04 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2011-11-13 02:19:04 +0000 |
| commit | 727f5b8f9d8e2b2b2cec656945bc640a89b6bbe2 (patch) | |
| tree | c2ae87f70f84708ac3d6668d95a149df175e04d5 /binaryurp | |
| parent | 4f41eaca1c5a0d68aa20f31728d5acc42bcab51e (diff) | |
i118582: OS/2 port - more misc. changes by ydario.
Diffstat (limited to 'binaryurp')
| -rw-r--r-- | binaryurp/qa/makefile.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/binaryurp/qa/makefile.mk b/binaryurp/qa/makefile.mk index 14b80c86cfaf..195c35adb578 100644 --- a/binaryurp/qa/makefile.mk +++ b/binaryurp/qa/makefile.mk @@ -33,17 +33,30 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk +.IF "$(GUI)" == "OS2" + +@all: + @echo "Skipping, cppunit broken." + +.ELSE + CFLAGSCXX += $(CPPUNIT_CFLAGS) DLLPRE = +.IF "$(GUI)" != "OS2" SLOFILES = $(SLO)/test-cache.obj $(SLO)/test-unmarshal.obj +.ENDIF SHL1IMPLIB = i$(SHL1TARGET) SHL1OBJS = $(SLO)/test-cache.obj SHL1RPATH = NONE SHL1STDLIBS = $(CPPUNITLIB) $(SALLIB) +.IF "$(GUI)" != "OS2" SHL1TARGET = test-cache +.ELSE +SHL1TARGET = test-c +.ENDIF SHL1VERSIONMAP = version.map DEF1NAME = $(SHL1TARGET) @@ -69,9 +82,16 @@ SHL2STDLIBS = \ $(CPPUNITLIB) \ $(SALHELPERLIB) \ $(SALLIB) +.IF "$(GUI)" != "OS2" SHL2TARGET = test-unmarshal +.ELSE +SHL2TARGET = test-u +.ENDIF SHL2VERSIONMAP = version.map DEF2NAME = $(SHL2TARGET) +.ENDIF # "$(GUI)" == "OS2" + .INCLUDE: target.mk .INCLUDE: _cppunit.mk + |