1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf
index 584bcf7..539cee7 100644
--- a/mkspecs/reliant-cds/qmake.conf
+++ b/mkspecs/reliant-cds/qmake.conf
@@ -9,73 +9,73 @@ TEMPLATE		= app
        CONFIG          += qt warn_on release
        QMAKE_CC        = cc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_DEPS= -M
        QMAKE_CFLAGS_WARN_ON= -v
        QMAKE_CFLAGS_WARN_OFF= -w
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= -KPIC
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -K pthread
        QMAKE_CXX       = CC
        QMAKE_CXXFLAGS  = $$QMAKE_CFLAGS $(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= /opt/X/include/X11
        QMAKE_LIBDIR_X11= /opt/X/lib
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL=
        QMAKE_LIBDIR_OPENGL=
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -G
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
        QMAKE_LFLAGS_THREAD= -K pthread
        QMAKE_RPATH     = -Wl,-Brpath=,
-        QMAKE_LIBS      =
+        QMAKE_LIBS      = $(LIBS_EXTRA)
        QMAKE_LIBS_DYNLOAD= -ldl
        QMAKE_LIBS_X11  = -lXext -lX11 -lresolv -lsocket -lnsl -lm
        QMAKE_LIBS_X11SM= -lSM -lICE
        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        = CC -xar -o
        QMAKE_RANLIB    =
        QMAKE_CLEAN     = -r $(OBJECTS_DIR)/Templates.DB
        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

diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index 584bcf7..539cee7 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf
@@ -9,73 +9,73 @@ TEMPLATE = app
9	CONFIG += qt warn_on release	9	CONFIG += qt warn_on release
10		10
11	QMAKE_CC = cc	11	QMAKE_CC = cc
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 = $(CFLAGS_EXTRA)	16	QMAKE_CFLAGS = $(CFLAGS_EXTRA)
17	QMAKE_CFLAGS_DEPS= -M	17	QMAKE_CFLAGS_DEPS= -M
18	QMAKE_CFLAGS_WARN_ON= -v	18	QMAKE_CFLAGS_WARN_ON= -v
19	QMAKE_CFLAGS_WARN_OFF= -w	19	QMAKE_CFLAGS_WARN_OFF= -w
20	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)	20	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O)
21	QMAKE_CFLAGS_DEBUG= -g	21	QMAKE_CFLAGS_DEBUG= -g
22	QMAKE_CFLAGS_SHLIB= -KPIC	22	QMAKE_CFLAGS_SHLIB= -KPIC
23	QMAKE_CFLAGS_YACC=	23	QMAKE_CFLAGS_YACC=
24	QMAKE_CFLAGS_THREAD= -K pthread	24	QMAKE_CFLAGS_THREAD= -K pthread
25		25
26	QMAKE_CXX = CC	26	QMAKE_CXX = CC
27	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)	27	QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS	28	QMAKE_CXXFLAGS_DEPS= $$QMAKE_CFLAGS_DEPS
29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	29	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	30	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
31	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	31	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
32	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	32	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
33	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	33	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
34	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	34	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
35	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	35	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
36		36
37	QMAKE_INCDIR =	37	QMAKE_INCDIR =
38	QMAKE_LIBDIR =	38	QMAKE_LIBDIR =
39	QMAKE_INCDIR_X11= /opt/X/include/X11	39	QMAKE_INCDIR_X11= /opt/X/include/X11
40	QMAKE_LIBDIR_X11= /opt/X/lib	40	QMAKE_LIBDIR_X11= /opt/X/lib
41	QMAKE_INCDIR_QT = $(QTDIR)/include	41	QMAKE_INCDIR_QT = $(QTDIR)/include
42	QMAKE_LIBDIR_QT = $(QTDIR)/lib	42	QMAKE_LIBDIR_QT = $(QTDIR)/lib
43	QMAKE_INCDIR_OPENGL=	43	QMAKE_INCDIR_OPENGL=
44	QMAKE_LIBDIR_OPENGL=	44	QMAKE_LIBDIR_OPENGL=
45		45
46	QMAKE_LINK = CC	46	QMAKE_LINK = CC
47	QMAKE_LINK_SHLIB= CC	47	QMAKE_LINK_SHLIB= CC
48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)	48	QMAKE_LFLAGS = $(LFLAGS_EXTRA)
49	QMAKE_LFLAGS_RELEASE=	49	QMAKE_LFLAGS_RELEASE=
50	QMAKE_LFLAGS_DEBUG=	50	QMAKE_LFLAGS_DEBUG=
51	QMAKE_LFLAGS_SHLIB= -G	51	QMAKE_LFLAGS_SHLIB= -G
52	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	52	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
53	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE	53	QMAKE_LFLAGS_SONAME= -h$$LITERAL_WHITESPACE
54	QMAKE_LFLAGS_THREAD= -K pthread	54	QMAKE_LFLAGS_THREAD= -K pthread
55	QMAKE_RPATH = -Wl,-Brpath=,	55	QMAKE_RPATH = -Wl,-Brpath=,
56		56
57	QMAKE_LIBS =	57	QMAKE_LIBS = $(LIBS_EXTRA)
58	QMAKE_LIBS_DYNLOAD= -ldl	58	QMAKE_LIBS_DYNLOAD= -ldl
59	QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm	59	QMAKE_LIBS_X11 = -lXext -lX11 -lresolv -lsocket -lnsl -lm
60	QMAKE_LIBS_X11SM= -lSM -lICE	60	QMAKE_LIBS_X11SM= -lSM -lICE
61	QMAKE_LIBS_QT = -lqt	61	QMAKE_LIBS_QT = -lqt
62	QMAKE_LIBS_QT_THREAD= -lqt-mt	62	QMAKE_LIBS_QT_THREAD= -lqt-mt
63	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu	63	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
64	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu	64	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
65	QMAKE_LIBS_THREAD=	65	QMAKE_LIBS_THREAD=
66		66
67	QMAKE_MOC = $(QTDIR)/bin/moc	67	QMAKE_MOC = $(QTDIR)/bin/moc
68	QMAKE_UIC = $(QTDIR)/bin/uic	68	QMAKE_UIC = $(QTDIR)/bin/uic
69		69
70	QMAKE_AR = CC -xar -o	70	QMAKE_AR = CC -xar -o
71	QMAKE_RANLIB =	71	QMAKE_RANLIB =
72		72
73	QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB	73	QMAKE_CLEAN = -r $(OBJECTS_DIR)/Templates.DB
74		74
75	QMAKE_TAR = tar -cf	75	QMAKE_TAR = tar -cf
76	QMAKE_GZIP = gzip -9f	76	QMAKE_GZIP = gzip -9f
77		77
78	QMAKE_COPY = cp -f	78	QMAKE_COPY = cp -f
79	QMAKE_MOVE = mv -f	79	QMAKE_MOVE = mv -f
80	QMAKE_DEL_FILE = rm -f	80	QMAKE_DEL_FILE = rm -f
81	QMAKE_DEL_DIR = rmdir	81	QMAKE_DEL_DIR = rmdir