author | ar <ar> | 2004-10-17 11:56:29 (UTC) |
---|---|---|
committer | ar <ar> | 2004-10-17 11:56:29 (UTC) |
commit | e569b68344c4b87b808b7cb8653be7e82153c5b7 (patch) (unidiff) | |
tree | 59dc4c58f975078fc7ceec2736de5e3e20857432 /mkspecs | |
parent | fa64fa8f5af34f2b1c792816db3f24a3416a5f6d (diff) | |
download | opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.zip opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.tar.gz opie-e569b68344c4b87b808b7cb8653be7e82153c5b7.tar.bz2 |
- revert DISTCC changes
(see mailinglist and wiki for use ccache and/or distcc)
-rw-r--r-- | mkspecs/qws/linux-generic-g++/qmake.conf | 12 |
1 files changed, 6 insertions, 6 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 | |||
@@ -7,9 +7,9 @@ | |||
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 = $(CCACHE) gcc | 11 | QMAKE_CC = $(CCACHE) $(DISTCC) 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 |
@@ -21,9 +21,9 @@ 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 = $(CCACHE) g++ | 25 | QMAKE_CXX = $(CCACHE) $(DISTCC) 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 |
@@ -33,10 +33,10 @@ 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 |
@@ -55,10 +55,10 @@ QMAKE_LFLAGS_THREAD = | |||
55 | QMAKE_RPATH = -Wl,-rpath, | 55 | QMAKE_RPATH = -Wl,-rpath, |
56 | 56 | ||
57 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD = -ldl | 58 | QMAKE_LIBS_DYNLOAD = -ldl |
59 | QMAKE_LIBS_X11 = | 59 | QMAKE_LIBS_X11 = |
60 | QMAKE_LIBS_X11SM= | 60 | QMAKE_LIBS_X11SM= |
61 | QMAKE_LIBS_QT = -lqte | 61 | QMAKE_LIBS_QT = -lqte |
62 | QMAKE_LIBS_QT_THREAD = -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD = -lqte-mt |
63 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe | 64 | QMAKE_LIBS_QTOPIA= -lqtopia -lqpe |