Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment

author: kergoth <kergoth> 2002-11-06 04:05:21 (UTC)
committer: kergoth <kergoth> 2002-11-06 04:05:21 (UTC)
commit: ac1509552bf764ff136690e0e7014d37a59d073e (patch) (unidiff)
tree: 6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/linux-kcc
parent: 6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff)
download: opie-ac1509552bf764ff136690e0e7014d37a59d073e.zip
opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz
opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 20bcd80..17bf26a 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -1,89 +1,89 @@
 #
 # $Id$
 #
 # qmake configuration for KAI C++ 4.0f for Linux
 #
 # From the KAI C++ man page for Linux:
 # --[no_]thread_safe
        # [Waive or] Request thread-safe handling of system-allocated objects.
        # To guarantee thread safety, this option must be used when both
        # compiling and linking. Thread-safe C++ is not link-compatible with
        # (the default) non-thread-safe C++.
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt warn_on release
        QMAKE_CC        = KCC
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = --c --display_error_number --backend -pipe
+        QMAKE_CFLAGS    = --c --display_error_number --backend -pipe $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_DEPS= -M
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= +K2
        QMAKE_CFLAGS_DEBUG= +K0
        QMAKE_CFLAGS_SHLIB= -fPIC
        QMAKE_CFLAGS_YACC= --diag_suppress 111,177
        QMAKE_CFLAGS_THREAD= --thread_safe
        QMAKE_CXX       = KCC
-        QMAKE_CXXFLAGS  = --display_error_number --diag_suppress 611,1142 --backend -pipe
+        QMAKE_CXXFLAGS  = --display_error_number --diag_suppress 611,1142 --backend -pipe $(CXXFLAGS_EXTRA)
        QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
        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= /usr/X11R6/include
        QMAKE_LIBDIR_X11= /usr/X11R6/lib
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /usr/X11R6/include
        QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
        QMAKE_LINK      = KCC
        QMAKE_LINK_SHLIB= KCC
-        QMAKE_LFLAGS    =
+        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB=
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE
        QMAKE_LFLAGS_THREAD= --thread_safe
        QMAKE_RPATH     = -rpath$$LITERAL_WHITESPACE
        QMAKE_LIBS      =
        QMAKE_LIBS_DYNLOAD= -ldl
        QMAKE_LIBS_X11  = -lXext -lX11 -lm
        QMAKE_LIBS_X11SM= -lSM -lICE
        QMAKE_LIBS_NIS  = -lnsl
        QMAKE_LIBS_QT   = -lqt
        QMAKE_LIBS_QT_THREAD= -lqt-mt
        QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
        QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
        QMAKE_LIBS_THREAD=
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cqs
        QMAKE_RANLIB    =
        QMAKE_CLEAN     = -r $(OBJECTS_DIR)ti_files
        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
author	kergoth <kergoth>	2002-11-06 04:05:21 (UTC)
committer	kergoth <kergoth>	2002-11-06 04:05:21 (UTC)
commit	ac1509552bf764ff136690e0e7014d37a59d073e (patch) (unidiff)
tree	6582d6f7574be2f468519b100889cc6c9113c85c /mkspecs/linux-kcc
parent	6b7d5deabe1d2da336fbe6c8409e437cbb8a1c89 (diff)
download	opie-ac1509552bf764ff136690e0e7014d37a59d073e.zip opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.gz opie-ac1509552bf764ff136690e0e7014d37a59d073e.tar.bz2

diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 20bcd80..17bf26a 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf
@@ -1,89 +1,89 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for KAI C++ 4.0f for Linux	4	# qmake configuration for KAI C++ 4.0f for Linux
5	#	5	#
6	# From the KAI C++ man page for Linux:	6	# From the KAI C++ man page for Linux:
7	# --[no_]thread_safe	7	# --[no_]thread_safe
8	# [Waive or] Request thread-safe handling of system-allocated objects.	8	# [Waive or] Request thread-safe handling of system-allocated objects.
9	# To guarantee thread safety, this option must be used when both	9	# To guarantee thread safety, this option must be used when both
10	# compiling and linking. Thread-safe C++ is not link-compatible with	10	# compiling and linking. Thread-safe C++ is not link-compatible with
11	# (the default) non-thread-safe C++.	11	# (the default) non-thread-safe C++.
12	#	12	#
13		13
14	MAKEFILE_GENERATOR= UNIX	14	MAKEFILE_GENERATOR= UNIX
15	TEMPLATE = app	15	TEMPLATE = app
16	CONFIG += qt warn_on release	16	CONFIG += qt warn_on release
17		17
18	QMAKE_CC = KCC	18	QMAKE_CC = KCC
19	QMAKE_LEX = flex	19	QMAKE_LEX = flex
20	QMAKE_LEXFLAGS =	20	QMAKE_LEXFLAGS =
21	QMAKE_YACC = yacc	21	QMAKE_YACC = yacc
22	QMAKE_YACCFLAGS = -d	22	QMAKE_YACCFLAGS = -d
23	QMAKE_CFLAGS = --c --display_error_number --backend -pipe	23	QMAKE_CFLAGS = --c --display_error_number --backend -pipe $(CFLAGS_EXTRA)
24	QMAKE_CFLAGS_DEPS= -M	24	QMAKE_CFLAGS_DEPS= -M
25	QMAKE_CFLAGS_WARN_ON=	25	QMAKE_CFLAGS_WARN_ON=
26	QMAKE_CFLAGS_WARN_OFF= -w	26	QMAKE_CFLAGS_WARN_OFF= -w
27	QMAKE_CFLAGS_RELEASE= +K2	27	QMAKE_CFLAGS_RELEASE= +K2
28	QMAKE_CFLAGS_DEBUG= +K0	28	QMAKE_CFLAGS_DEBUG= +K0
29	QMAKE_CFLAGS_SHLIB= -fPIC	29	QMAKE_CFLAGS_SHLIB= -fPIC
30	QMAKE_CFLAGS_YACC= --diag_suppress 111,177	30	QMAKE_CFLAGS_YACC= --diag_suppress 111,177
31	QMAKE_CFLAGS_THREAD= --thread_safe	31	QMAKE_CFLAGS_THREAD= --thread_safe
32		32
33	QMAKE_CXX = KCC	33	QMAKE_CXX = KCC
34	QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe	34	QMAKE_CXXFLAGS = --display_error_number --diag_suppress 611,1142 --backend -pipe $(CXXFLAGS_EXTRA)
35	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	35	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
36	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	36	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
37	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	37	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
38	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	38	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
39	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	39	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
40	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	40	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
41	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	41	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
42	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	42	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
43		43
44	QMAKE_INCDIR =	44	QMAKE_INCDIR =
45	QMAKE_LIBDIR =	45	QMAKE_LIBDIR =
46	QMAKE_INCDIR_X11= /usr/X11R6/include	46	QMAKE_INCDIR_X11= /usr/X11R6/include
47	QMAKE_LIBDIR_X11= /usr/X11R6/lib	47	QMAKE_LIBDIR_X11= /usr/X11R6/lib
48	QMAKE_INCDIR_QT = $(QTDIR)/include	48	QMAKE_INCDIR_QT = $(QTDIR)/include
49	QMAKE_LIBDIR_QT = $(QTDIR)/lib	49	QMAKE_LIBDIR_QT = $(QTDIR)/lib
50	QMAKE_INCDIR_OPENGL= /usr/X11R6/include	50	QMAKE_INCDIR_OPENGL= /usr/X11R6/include
51	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib	51	QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib
52		52
53	QMAKE_LINK = KCC	53	QMAKE_LINK = KCC
54	QMAKE_LINK_SHLIB= KCC	54	QMAKE_LINK_SHLIB= KCC
55	QMAKE_LFLAGS =	55	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
56	QMAKE_LFLAGS_RELEASE=	56	QMAKE_LFLAGS_RELEASE=
57	QMAKE_LFLAGS_DEBUG=	57	QMAKE_LFLAGS_DEBUG=
58	QMAKE_LFLAGS_SHLIB=	58	QMAKE_LFLAGS_SHLIB=
59	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	59	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
60	QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE	60	QMAKE_LFLAGS_SONAME= --soname$$LITERAL_WHITESPACE
61	QMAKE_LFLAGS_THREAD= --thread_safe	61	QMAKE_LFLAGS_THREAD= --thread_safe
62	QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE	62	QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE
63		63
64	QMAKE_LIBS =	64	QMAKE_LIBS =
65	QMAKE_LIBS_DYNLOAD= -ldl	65	QMAKE_LIBS_DYNLOAD= -ldl
66	QMAKE_LIBS_X11 = -lXext -lX11 -lm	66	QMAKE_LIBS_X11 = -lXext -lX11 -lm
67	QMAKE_LIBS_X11SM= -lSM -lICE	67	QMAKE_LIBS_X11SM= -lSM -lICE
68	QMAKE_LIBS_NIS = -lnsl	68	QMAKE_LIBS_NIS = -lnsl
69	QMAKE_LIBS_QT = -lqt	69	QMAKE_LIBS_QT = -lqt
70	QMAKE_LIBS_QT_THREAD= -lqt-mt	70	QMAKE_LIBS_QT_THREAD= -lqt-mt
71	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu	71	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
72	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu	72	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
73	QMAKE_LIBS_THREAD=	73	QMAKE_LIBS_THREAD=
74		74
75	QMAKE_MOC = $(QTDIR)/bin/moc	75	QMAKE_MOC = $(QTDIR)/bin/moc
76	QMAKE_UIC = $(QTDIR)/bin/uic	76	QMAKE_UIC = $(QTDIR)/bin/uic
77		77
78	QMAKE_AR = ar cqs	78	QMAKE_AR = ar cqs
79	QMAKE_RANLIB =	79	QMAKE_RANLIB =
80		80
81	QMAKE_CLEAN = -r $(OBJECTS_DIR)ti_files	81	QMAKE_CLEAN = -r $(OBJECTS_DIR)ti_files
82		82
83	QMAKE_TAR = tar -cf	83	QMAKE_TAR = tar -cf
84	QMAKE_GZIP = gzip -9f	84	QMAKE_GZIP = gzip -9f
85		85
86	QMAKE_COPY = cp -f	86	QMAKE_COPY = cp -f
87	QMAKE_MOVE = mv -f	87	QMAKE_MOVE = mv -f
88	QMAKE_DEL_FILE = rm -f	88	QMAKE_DEL_FILE = rm -f
89	QMAKE_DEL_DIR = rmdir	89	QMAKE_DEL_DIR = rmdir