summaryrefslogtreecommitdiff
authorclem <clem>2004-10-14 14:45:51 (UTC)
committer clem <clem>2004-10-14 14:45:51 (UTC)
commitc1527ffba858ba88dc349edea26347eca37ccef4 (patch) (unidiff)
treeb1eda5042f37ac822fda0053e0cdac4b4cb91cb8
parentc4455769d3d0b6409e2f676e9e3769ed93d1772e (diff)
downloadopie-c1527ffba858ba88dc349edea26347eca37ccef4.zip
opie-c1527ffba858ba88dc349edea26347eca37ccef4.tar.gz
opie-c1527ffba858ba88dc349edea26347eca37ccef4.tar.bz2
enable ccache (and distcc if CCACHE_PREFIX and DISTCC_HOSTS are set) building
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--mkspecs/qws/linux-arm-g++/qmake.conf4
-rw-r--r--mkspecs/qws/linux-ipaq-g++/qmake.conf4
-rw-r--r--qmake/Makefile4
3 files changed, 6 insertions, 6 deletions
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf
index 244f9a8..20d1b63 100644
--- a/mkspecs/qws/linux-arm-g++/qmake.conf
+++ b/mkspecs/qws/linux-arm-g++/qmake.conf
@@ -1,49 +1,49 @@
1# 1#
2# $Id$ 2# $Id$
3# 3#
4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler 4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
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 = arm-linux-gcc 11 QMAKE_CC = $(shell which 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
18 QMAKE_CFLAGS_WARN_OFF= 18 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 = arm-linux-g++ 25 QMAKE_CXX = $(shell which 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
32 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC 32 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD 33 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34 34
35 QMAKE_INCDIR = 35 QMAKE_INCDIR =
36 QMAKE_LIBDIR = 36 QMAKE_LIBDIR =
37 QMAKE_INCDIR_X11= 37 QMAKE_INCDIR_X11=
38 QMAKE_LIBDIR_X11= 38 QMAKE_LIBDIR_X11=
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include 43 QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
44 QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib 44 QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
45 45
46 QMAKE_LINK = arm-linux-g++ 46 QMAKE_LINK = arm-linux-g++
47 QMAKE_LINK_SHLIB= arm-linux-g++ 47 QMAKE_LINK_SHLIB= arm-linux-g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf
index adde72b..83fed4b 100644
--- a/mkspecs/qws/linux-ipaq-g++/qmake.conf
+++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -1,49 +1,49 @@
1# 1#
2# $Id$ 2# $Id$
3# 3#
4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler 4# qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
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 = arm-linux-gcc 11 QMAKE_CC = $(shell which 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
18 QMAKE_CFLAGS_WARN_OFF= 18 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 = arm-linux-g++ -DQT_QWS_IPAQ 25 QMAKE_CXX = $(shell which 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
32 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC 32 QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
33 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD 33 QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
34 34
35 QMAKE_INCDIR = 35 QMAKE_INCDIR =
36 QMAKE_LIBDIR = 36 QMAKE_LIBDIR =
37 QMAKE_INCDIR_X11= 37 QMAKE_INCDIR_X11=
38 QMAKE_LIBDIR_X11= 38 QMAKE_LIBDIR_X11=
39 QMAKE_INCDIR_QT = $(QTDIR)/include 39 QMAKE_INCDIR_QT = $(QTDIR)/include
40 QMAKE_LIBDIR_QT = $(QTDIR)/lib 40 QMAKE_LIBDIR_QT = $(QTDIR)/lib
41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include 41 QMAKE_INCDIR_OPENGL= /usr/X11R6/include
42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib 42 QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
43 QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include 43 QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
44 QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib 44 QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
45 45
46 QMAKE_LINK = arm-linux-g++ 46 QMAKE_LINK = arm-linux-g++
47 QMAKE_LINK_SHLIB= arm-linux-g++ 47 QMAKE_LINK_SHLIB= arm-linux-g++
48 QMAKE_LFLAGS = $(LFLAGS_EXTRA) 48 QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49 QMAKE_LFLAGS_RELEASE= 49 QMAKE_LFLAGS_RELEASE=
diff --git a/qmake/Makefile b/qmake/Makefile
index 5a72210..3045766 100644
--- a/qmake/Makefile
+++ b/qmake/Makefile
@@ -1,28 +1,28 @@
1QMAKESPECSDIR=$(OPIEDIR)/mkspecs 1QMAKESPECSDIR=$(OPIEDIR)/mkspecs
2 2
3 CC = gcc 3 CC = $(shell which ccache) gcc
4 CXX = g++ 4 CXX = $(shell which ccache) g++
5 5
6#qmake code 6#qmake code
7OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ 7OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
8 borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ 8 borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
9 winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \ 9 winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \
10 msvc_objectmodel.o meta.o qtmd5.o 10 msvc_objectmodel.o meta.o qtmd5.o
11 11
12#qt code 12#qt code
13QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ 13QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
14 qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ 14 qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \
15 qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \ 15 qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \
16 qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ 16 qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \
17 qconfig.o qunicodetables.o qsettings.o qlocale.o 17 qconfig.o qunicodetables.o qsettings.o qlocale.o
18 18
19#all sources, used for the depend target 19#all sources, used for the depend target
20DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ 20DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \
21 generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \ 21 generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
22 generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \ 22 generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \
23 generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \ 23 generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \
24 $(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \ 24 $(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \
25 $(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \ 25 $(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \
26 $(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \ 26 $(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \
27 $(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \ 27 $(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \
28 $(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \ 28 $(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \