summaryrefslogtreecommitdiff
path: root/mkspecs
authorar <ar>2004-10-17 11:56:29 (UTC)
committer ar <ar>2004-10-17 11:56:29 (UTC)
commite569b68344c4b87b808b7cb8653be7e82153c5b7 (patch) (side-by-side diff)
tree59dc4c58f975078fc7ceec2736de5e3e20857432 /mkspecs
parentfa64fa8f5af34f2b1c792816db3f24a3416a5f6d (diff)
downloadopie-e569b68344c4b87b808b7cb8653be7e82153c5b7.zip
opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.tar.gz
opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.tar.bz2
- revert DISTCC changes
(see mailinglist and wiki for use ccache and/or distcc)
Diffstat (limited to 'mkspecs') (more/less context) (show whitespace changes)
-rw-r--r--mkspecs/qws/linux-generic-g++/qmake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf
index 7a12e98..7de487d 100644
--- a/mkspecs/qws/linux-generic-g++/qmake.conf
+++ b/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -1,37 +1,37 @@
#
# $Id$
#
# qmake configuration for linux-g++
#
MAKEFILE_GENERATOR = UNIX
TEMPLATE = app
CONFIG += qt link_prl
-QMAKE_CC = $(CCACHE) gcc
+QMAKE_CC = $(CCACHE) $(DISTCC) 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 = $(CCACHE) g++
+QMAKE_CXX = $(CCACHE) $(DISTCC) 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 =