enable ccache (and distcc if CCACHE_PREFIX and DISTCC_HOSTS are set) building

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,81 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
         CONFIG          += qt link_prl
 
-        QMAKE_CC        = arm-linux-gcc
+        QMAKE_CC        = $(shell which 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
         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       = arm-linux-g++
+        QMAKE_CXX       = $(shell which 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
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
         QMAKE_INCDIR_X11= 
         QMAKE_LIBDIR_X11= 
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
         QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
         QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = arm-linux-g++
         QMAKE_LINK_SHLIB= arm-linux-g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_RPATH             = -Wl,-rpath,
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
         QMAKE_LIBS_X11  = 
         QMAKE_LIBS_X11SM= 
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
         QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = ar cqs
         QMAKE_RANLIB    =
 
         QMAKE_TAR       = tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
         QMAKE_CHK_DIR_EXISTS= test -d
         QMAKE_MKDIR     = mkdir -p
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,81 +1,81 @@
 #
 # $Id$
 #
 # qmake configuration for linux-g++ using the arm-linux-g++ crosscompiler
 #
 
         MAKEFILE_GENERATOR= UNIX
         TEMPLATE        = app
         CONFIG          += qt link_prl
 
-        QMAKE_CC        = arm-linux-gcc
+        QMAKE_CC        = $(shell which 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
         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       = arm-linux-g++ -DQT_QWS_IPAQ
+        QMAKE_CXX       = $(shell which 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
         QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
         QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
 
         QMAKE_INCDIR    =
         QMAKE_LIBDIR    =
         QMAKE_INCDIR_X11= 
         QMAKE_LIBDIR_X11= 
         QMAKE_INCDIR_QT         = $(QTDIR)/include
         QMAKE_LIBDIR_QT         = $(QTDIR)/lib
         QMAKE_INCDIR_OPENGL= /usr/X11R6/include
         QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
         QMAKE_INCDIR_QTOPIA= $(QPEDIR)/include
         QMAKE_LIBDIR_QTOPIA= $(QPEDIR)/lib
 
         QMAKE_LINK      = arm-linux-g++
         QMAKE_LINK_SHLIB= arm-linux-g++
         QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
         QMAKE_LFLAGS_RELEASE=
         QMAKE_LFLAGS_DEBUG=
 QMAKE_LFLAGS_SHLIB      = -shared
 QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME     = -Wl,-soname,
 QMAKE_LFLAGS_THREAD     =
 QMAKE_RPATH             = -Wl,-rpath-link,
 
         QMAKE_LIBS      = $(LIBS_EXTRA)
 QMAKE_LIBS_DYNLOAD      = -ldl
         QMAKE_LIBS_X11  = 
         QMAKE_LIBS_X11SM= 
         QMAKE_LIBS_QT   = -lqte
 QMAKE_LIBS_QT_THREAD    = -lqte-mt
         QMAKE_LIBS_QT_OPENGL= -lqgl
         QMAKE_LIBS_QTOPIA= -lqtopia -lqpe
 QMAKE_LIBS_THREAD       = -lpthread
 
         QMAKE_MOC       = $(QTDIR)/bin/moc
         QMAKE_UIC       = $(QTDIR)/bin/uic
 
         QMAKE_AR        = ar cqs
         QMAKE_RANLIB    =
 
         QMAKE_TAR       = tar -cf
         QMAKE_GZIP      = gzip -9f
 
         QMAKE_COPY      = cp -f
         QMAKE_MOVE      = mv -f
         QMAKE_DEL_FILE  = rm -f
         QMAKE_DEL_DIR   = rmdir
         QMAKE_CHK_DIR_EXISTS= test -d
         QMAKE_MKDIR     = mkdir -p
diff --git a/qmake/Makefile b/qmake/Makefile
index 5a72210..3045766 100644
--- a/qmake/Makefile
+++ b/qmake/Makefile
@@ -1,68 +1,68 @@
 QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 
-        CC      = gcc
-        CXX     = g++
+        CC      = $(shell which ccache) gcc
+        CXX     = $(shell which ccache) g++
 
 #qmake code
 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
      borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
      winmakefile.o projectgenerator.o metrowerks_xml.o  pbuilder_pbx.o \
      msvc_objectmodel.o meta.o qtmd5.o
 
 #qt code
 QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
       qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \
       qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \
       qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \
       qconfig.o qunicodetables.o qsettings.o qlocale.o 
 
 #all sources, used for the depend target
 DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \
            generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \
            generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \
            generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \
            $(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \
            $(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \
            $(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \
            $(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \
            $(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \
            $(OPIEDIR)/qmake/tools/qptrcollection.cpp $(OPIEDIR)/qmake/tools/qfile.cpp \
            $(OPIEDIR)/qmake/tools/qfile_unix.cpp $(OPIEDIR)/qmake/tools/qregexp.cpp \
            $(OPIEDIR)/qmake/tools/qgvector.cpp $(OPIEDIR)/qmake/tools/qgcache.cpp \
            $(OPIEDIR)/qmake/tools/qbitarray.cpp $(OPIEDIR)/qmake/tools/qdir.cpp \
            $(OPIEDIR)/qmake/tools/quuid.cpp $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp \
            $(OPIEDIR)/qmake/tools/qdir_unix.cpp $(OPIEDIR)/qmake/tools/qfileinfo.cpp \
            $(OPIEDIR)/qmake/tools/qdatetime.cpp $(OPIEDIR)/qmake/tools/qstringlist.cpp \
            $(OPIEDIR)/qmake/tools/qmap.cpp $(OPIEDIR)/qmake/tools/qconfig.cpp \
            $(OPIEDIR)/qmake/tools/qsettings.cpp $(OPIEDIR)/qmake/tools/qurl.cpp \
            $(OPIEDIR)/qmake/tools/qsettings_mac.cpp $(OPIEDIR)/qmake/tools/qlocale.cpp
 
 CXXFLAGS=  \
         -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
         -I$(OPIEDIR)/qmake/include/qmake -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/private \
         -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
         -DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/default -DHAVE_QCONFIG_CPP
 LFLAGS=
 
 qmake: $(OBJS) $(QOBJS)
         $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
         $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@)
         $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@)
 
 install: qmake
         [ -d $(INSTALL_ROOT)$(QTDIR)/bin ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)/bin
         -cp -f $(QTDIR)/bin/qmake $(INSTALL_ROOT)$(QTDIR)/bin
         [ -d $(INSTALL_ROOT)$(QTDIR) ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)
         -cp -r -f $(QMAKESPECSDIR) $(INSTALL_ROOT)$(QTDIR)
 
 clean::
         rm -f $(OBJS) $(QOBJS)
 
 distclean:: clean
         rm -rf qmake .deps
 
 
 # don't use optimization for these
 qtextstream.o: $(OPIEDIR)/qmake/tools/qtextstream.cpp
         $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qtextstream.cpp