summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorPedro Giffuni <pfg@apache.org>2011-11-24 15:21:24 +0000
committerPedro Giffuni <pfg@apache.org>2011-11-24 15:21:24 +0000
commitfcd3ba7227013f6993f324395377a84a60ddbf28 (patch)
tree8855b0c393563a02fb674ececd2f3becda260d33 /desktop
parent70010c2d7c6472ae40fb0a8fd97e9da159a220b8 (diff)
i118608 - IP clearance: Remove internal cppunit source, use system-cppunit instead. Patch by Andre Fischer (af).
Diffstat (limited to 'desktop')
-rw-r--r--desktop/qa/deployment_misc/makefile.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/desktop/qa/deployment_misc/makefile.mk b/desktop/qa/deployment_misc/makefile.mk
index c5a2444c1669..29d59e5a6d68 100644
--- a/desktop/qa/deployment_misc/makefile.mk
+++ b/desktop/qa/deployment_misc/makefile.mk
@@ -25,12 +25,16 @@
#
#*************************************************************************
-.IF "$(GUI)" == "OS2"
+.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
-.ENDIF # "$(GUI)" == "OS2"
+.ENDIF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
PRJ := ..$/..
PRJNAME := desktop