summaryrefslogtreecommitdiff
authorclem <clem>2004-10-14 19:55:01 (UTC)
committer clem <clem>2004-10-14 19:55:01 (UTC)
commit41caadd5f5c674f6a9c59e7b63dc8c486382e96a (patch) (side-by-side diff)
tree9ebcd4283db703e73c668b6877867268c516f837
parentfe575d13c42fe748a8a3bc8ce2525c3e453a7b95 (diff)
downloadopie-41caadd5f5c674f6a9c59e7b63dc8c486382e96a.zip
opie-41caadd5f5c674f6a9c59e7b63dc8c486382e96a.tar.gz
opie-41caadd5f5c674f6a9c59e7b63dc8c486382e96a.tar.bz2
setting CCACHE_PREFIX is better that setting DISTCC when using ccache (see man). Defined so it will be 'distcc' only if distcc is in the PATH -- note: if you really don't want to use ccache, define CCACHE as 'distcc' :)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make1
1 files changed, 1 insertions, 0 deletions
diff --git a/Vars.make b/Vars.make
index f547afe..e76804d 100644
--- a/Vars.make
+++ b/Vars.make
@@ -61,65 +61,66 @@ ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VER
SUB_VERSION:=$(VERSION_CVS)
endif
export SUB_VERSION
ifneq ($(strip $(SUB_VERSION)),)
EXTRAVERSION=-$(SUB_VERSION)
endif
ifeq ($(QTE_REVISION),)
QTE_REVISION=6
endif
export QTE_REVISION
export DEB_VERSION=2.0
ifeq ($(QTE_BASEVERSION),)
ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
else
QTE_BASEVERSION=2.3.7
endif
endif
export QTE_BASEVERSION
ifeq ($(QTE_VERSION),)
ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;')
else
QTE_VERSION=2.3.7
endif
endif
export QTE_VERSION
export PATH:=$(OPIEDIR)/scripts:$(PATH)
export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
ifdef CONFIG_OPTIMIZATIONS
export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
endif
ifeq ($(STRIP),)
ifneq ($(CONFIG_TARGET_X86),)
STRIP=strip
endif
ifneq ($(CONFIG_TARGET_IPAQ),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_SHARP),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_RAMSES),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_SIMPAD),)
STRIP=arm-linux-strip
endif
ifneq ($(CONFIG_TARGET_YOPY),)
STRIP=arm-linux-strip
endif
endif
export CCACHE=$(shell which ccache 2>/dev/null)
export DISTCC=$(shell which distcc 2>/dev/null)
+export CCACHE_PREFIX=$(shell which distcc &>/dev/null && echo distcc)