diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-11-24 15:21:24 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2011-11-24 15:21:24 +0000 |
| commit | fcd3ba7227013f6993f324395377a84a60ddbf28 (patch) | |
| tree | 8855b0c393563a02fb674ececd2f3becda260d33 /shell/qa | |
| parent | 70010c2d7c6472ae40fb0a8fd97e9da159a220b8 (diff) | |
i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af).
Diffstat (limited to 'shell/qa')
| -rw-r--r-- | shell/qa/zip/makefile.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/shell/qa/zip/makefile.mk b/shell/qa/zip/makefile.mk index 946b01db19f1..51d4af7825e6 100644 --- a/shell/qa/zip/makefile.mk +++ b/shell/qa/zip/makefile.mk @@ -34,6 +34,17 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk +.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2" + +@all: +.IF "$(GUI)" == "OS2" + @echo "Skipping, cppunit broken." +.ELIF "$(WITH_CPPUNIT)" != "YES" + @echo "cppunit disabled. nothing do do." +.END + +.ELSE + CFLAGSCXX += $(CPPUNIT_CFLAGS) SHL1OBJS = $(SLOFILES) @@ -45,6 +56,8 @@ SHL1VERSIONMAP = $(PRJ)/qa/zip/export.map DEF1NAME=$(SHL1TARGET) SLOFILES=$(SLO)$/ziptest.obj +.ENDIF + # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |