Using CCACHE since it's been already defined as `which ccache` by Vars.make

author: clem <clem> 2004-10-14 19:57:37 (UTC)
committer: clem <clem> 2004-10-14 19:57:37 (UTC)
commit: b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1 (patch) (unidiff)
tree: 1a769f1ea0153cc12709188669da912abeb0c58a
parent: e8fe99dbb1c0babb24158dfd1b294473f2d12d8c (diff)
download: opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.zip
opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.tar.gz
opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.tar.bz2
2 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index 20d1b63..62a8b5b 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -5,13 +5,13 @@
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt link_prl
-        QMAKE_CC        = $(shell which ccache) $(shell which arm-linux-gcc)
+        QMAKE_CC        = $(CCACHE) $(shell which arm-linux-gcc)
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  =
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -19,13 +19,13 @@ QMAKE_CFLAGS_WARN_OFF	=
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -fPIC
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
-        QMAKE_CXX       = $(shell which ccache) $(shell which arm-linux-g++)
+        QMAKE_CXX       = $(CCACHE) $(shell which arm-linux-g++)
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf
index 83fed4b..7c4c421 100644
--- a/mkspecs/qws/linux-ipaq-g++/qmake.conf
+++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -5,13 +5,13 @@
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt link_prl
-        QMAKE_CC        = $(shell which ccache) $(shell which arm-linux-gcc)
+        QMAKE_CC        = $(CCACHE) $(shell which arm-linux-gcc)
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  =
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = -pipe $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -19,13 +19,13 @@ QMAKE_CFLAGS_WARN_OFF	=
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -fPIC
        QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
        QMAKE_CFLAGS_THREAD= -D_REENTRANT
-        QMAKE_CXX       = $(shell which ccache) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
+        QMAKE_CXX       = $(CCACHE) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS  -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
        QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
        QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
        QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
        QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
author	clem <clem>	2004-10-14 19:57:37 (UTC)
committer	clem <clem>	2004-10-14 19:57:37 (UTC)
commit	b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1 (patch) (unidiff)
tree	1a769f1ea0153cc12709188669da912abeb0c58a
parent	e8fe99dbb1c0babb24158dfd1b294473f2d12d8c (diff)
download	opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.zip opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.tar.gz opie-b45e71025e8c827ecde1f2b8aa2560a9cb7e7fe1.tar.bz2

diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index 20d1b63..62a8b5b 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -5,13 +5,13 @@
5	#	5	#
6		6
7	MAKEFILE_GENERATOR= UNIX	7	MAKEFILE_GENERATOR= UNIX
8	TEMPLATE = app	8	TEMPLATE = app
9	CONFIG += qt link_prl	9	CONFIG += qt link_prl
10		10
11	QMAKE_CC = $(shell which ccache) $(shell which arm-linux-gcc)	11	QMAKE_CC = $(CCACHE) $(shell which arm-linux-gcc)
12	QMAKE_LEX = flex	12	QMAKE_LEX = flex
13	QMAKE_LEXFLAGS =	13	QMAKE_LEXFLAGS =
14	QMAKE_YACC = yacc	14	QMAKE_YACC = yacc
15	QMAKE_YACCFLAGS = -d	15	QMAKE_YACCFLAGS = -d
16	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)	16	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_WARN_ON= -Wall -W	17	QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -19,13 +19,13 @@ QMAKE_CFLAGS_WARN_OFF =
19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)	19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
20	QMAKE_CFLAGS_DEBUG= -g	20	QMAKE_CFLAGS_DEBUG= -g
21	QMAKE_CFLAGS_SHLIB= -fPIC	21	QMAKE_CFLAGS_SHLIB= -fPIC
22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses	22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
23	QMAKE_CFLAGS_THREAD= -D_REENTRANT	23	QMAKE_CFLAGS_THREAD= -D_REENTRANT
24		24
25	QMAKE_CXX = $(shell which ccache) $(shell which arm-linux-g++)	25	QMAKE_CXX = $(CCACHE) $(shell which arm-linux-g++)
26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)	26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB


diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index 83fed4b..7c4c421 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -5,13 +5,13 @@
5	#	5	#
6		6
7	MAKEFILE_GENERATOR= UNIX	7	MAKEFILE_GENERATOR= UNIX
8	TEMPLATE = app	8	TEMPLATE = app
9	CONFIG += qt link_prl	9	CONFIG += qt link_prl
10		10
11	QMAKE_CC = $(shell which ccache) $(shell which arm-linux-gcc)	11	QMAKE_CC = $(CCACHE) $(shell which arm-linux-gcc)
12	QMAKE_LEX = flex	12	QMAKE_LEX = flex
13	QMAKE_LEXFLAGS =	13	QMAKE_LEXFLAGS =
14	QMAKE_YACC = yacc	14	QMAKE_YACC = yacc
15	QMAKE_YACCFLAGS = -d	15	QMAKE_YACCFLAGS = -d
16	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)	16	QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_WARN_ON= -Wall -W	17	QMAKE_CFLAGS_WARN_ON= -Wall -W
@@ -19,13 +19,13 @@ QMAKE_CFLAGS_WARN_OFF =
19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)	19	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
20	QMAKE_CFLAGS_DEBUG= -g	20	QMAKE_CFLAGS_DEBUG= -g
21	QMAKE_CFLAGS_SHLIB= -fPIC	21	QMAKE_CFLAGS_SHLIB= -fPIC
22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses	22	QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses
23	QMAKE_CFLAGS_THREAD= -D_REENTRANT	23	QMAKE_CFLAGS_THREAD= -D_REENTRANT
24		24
25	QMAKE_CXX = $(shell which ccache) $(shell which arm-linux-g++) -DQT_QWS_IPAQ	25	QMAKE_CXX = $(CCACHE) $(shell which arm-linux-g++) -DQT_QWS_IPAQ
26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)	26	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA)
27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	27	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	28	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	29	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	30	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	31	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB