1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 6e17b4a..76ead61 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -1,85 +1,85 @@
 #
 # $Id$
 #
 # qmake configuration for aix-xlc
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt warn_on release
        QMAKE_CC        = xlc
        QMAKE_CC_THREAD         = xlc_r
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
        QMAKE_CFLAGS    = -qstrict $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF=
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB=
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE
        QMAKE_CXX       = xlC
        QMAKE_CXX_THREAD= xlC_r
        QMAKE_CXXFLAGS  = -+ $$QMAKE_CFLAGS $(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=
        QMAKE_LIBDIR_OPENGL=
        QMAKE_LINK      = xlC
        QMAKE_LINK_THREAD= xlC_r
        QMAKE_LINK_SHLIB= ld
        QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \
                            -o $(TARGETD) \
                            $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
                          ar q lib$(QMAKE_TARGET).a $(TARGETD); \
                          ranlib lib$(QMAKE_TARGET).a; \
                          mv lib$(QMAKE_TARGET).a $(DESTDIR)
        QMAKE_LFLAGS    = $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE=
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB=
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME=
        QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
-        QMAKE_LIBS      =
+        QMAKE_LIBS      = $(LIBS_EXTRA)
        QMAKE_LIBS_DYNLOAD= -ldl
        QMAKE_LIBS_X11  = -lXext -lX11 -lm -lbind
        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= -lpthreads
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cq
        QMAKE_RANLIB    = 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

diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 6e17b4a..76ead61 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf
@@ -1,85 +1,85 @@
1	#	1	#
2	# $Id$	2	# $Id$
3	#	3	#
4	# qmake configuration for aix-xlc	4	# qmake configuration for aix-xlc
5	#	5	#
6		6
7	MAKEFILE_GENERATOR= UNIX	7	MAKEFILE_GENERATOR= UNIX
8	TEMPLATE = app	8	TEMPLATE = app
9	CONFIG += qt warn_on release	9	CONFIG += qt warn_on release
10		10
11	QMAKE_CC = xlc	11	QMAKE_CC = xlc
12	QMAKE_CC_THREAD = xlc_r	12	QMAKE_CC_THREAD = xlc_r
13	QMAKE_LEX = flex	13	QMAKE_LEX = flex
14	QMAKE_LEXFLAGS =	14	QMAKE_LEXFLAGS =
15	QMAKE_YACC = yacc	15	QMAKE_YACC = yacc
16	QMAKE_YACCFLAGS = -d	16	QMAKE_YACCFLAGS = -d
17	QMAKE_CFLAGS = -qstrict $(CFLAGS_EXTRA)	17	QMAKE_CFLAGS = -qstrict $(CFLAGS_EXTRA)
18	QMAKE_CFLAGS_WARN_ON=	18	QMAKE_CFLAGS_WARN_ON=
19	QMAKE_CFLAGS_WARN_OFF=	19	QMAKE_CFLAGS_WARN_OFF=
20	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)	20	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O3)
21	QMAKE_CFLAGS_DEBUG= -g	21	QMAKE_CFLAGS_DEBUG= -g
22	QMAKE_CFLAGS_SHLIB=	22	QMAKE_CFLAGS_SHLIB=
23	QMAKE_CFLAGS_YACC=	23	QMAKE_CFLAGS_YACC=
24	QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE	24	QMAKE_CFLAGS_THREAD= -qthreaded -D_THREAD_SAFE
25		25
26	QMAKE_CXX = xlC	26	QMAKE_CXX = xlC
27	QMAKE_CXX_THREAD= xlC_r	27	QMAKE_CXX_THREAD= xlC_r
28	QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)	28	QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS $(CXXFLAGS_EXTRA)
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=	39	QMAKE_INCDIR_X11=
40	QMAKE_LIBDIR_X11=	40	QMAKE_LIBDIR_X11=
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 = xlC	46	QMAKE_LINK = xlC
47	QMAKE_LINK_THREAD= xlC_r	47	QMAKE_LINK_THREAD= xlC_r
48	QMAKE_LINK_SHLIB= ld	48	QMAKE_LINK_SHLIB= ld
49	QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \	49	QMAKE_LINK_SHLIB_CMD= makeC++SharedLib -p 0 \
50	-o $(TARGETD) \	50	-o $(TARGETD) \
51	$(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \	51	$(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \
52	ar q lib$(QMAKE_TARGET).a $(TARGETD); \	52	ar q lib$(QMAKE_TARGET).a $(TARGETD); \
53	ranlib lib$(QMAKE_TARGET).a; \	53	ranlib lib$(QMAKE_TARGET).a; \
54	mv lib$(QMAKE_TARGET).a $(DESTDIR)	54	mv lib$(QMAKE_TARGET).a $(DESTDIR)
55	QMAKE_LFLAGS = $(LFLAGS_EXTRA)	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=	60	QMAKE_LFLAGS_SONAME=
61	QMAKE_LFLAGS_THREAD= -L/usr/lib/threads	61	QMAKE_LFLAGS_THREAD= -L/usr/lib/threads
62		62
63	QMAKE_LIBS =	63	QMAKE_LIBS = $(LIBS_EXTRA)
64	QMAKE_LIBS_DYNLOAD= -ldl	64	QMAKE_LIBS_DYNLOAD= -ldl
65	QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind	65	QMAKE_LIBS_X11 = -lXext -lX11 -lm -lbind
66	QMAKE_LIBS_X11SM= -lSM -lICE	66	QMAKE_LIBS_X11SM= -lSM -lICE
67	QMAKE_LIBS_QT = -lqt	67	QMAKE_LIBS_QT = -lqt
68	QMAKE_LIBS_QT_THREAD= -lqt-mt	68	QMAKE_LIBS_QT_THREAD= -lqt-mt
69	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu	69	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
70	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu	70	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
71	QMAKE_LIBS_THREAD= -lpthreads	71	QMAKE_LIBS_THREAD= -lpthreads
72		72
73	QMAKE_MOC = $(QTDIR)/bin/moc	73	QMAKE_MOC = $(QTDIR)/bin/moc
74	QMAKE_UIC = $(QTDIR)/bin/uic	74	QMAKE_UIC = $(QTDIR)/bin/uic
75		75
76	QMAKE_AR = ar cq	76	QMAKE_AR = ar cq
77	QMAKE_RANLIB = ranlib	77	QMAKE_RANLIB = ranlib
78		78
79	QMAKE_TAR = tar -cf	79	QMAKE_TAR = tar -cf
80	QMAKE_GZIP = gzip -9f	80	QMAKE_GZIP = gzip -9f
81		81
82	QMAKE_COPY = cp -f	82	QMAKE_COPY = cp -f
83	QMAKE_MOVE = mv -f	83	QMAKE_MOVE = mv -f
84	QMAKE_DEL_FILE = rm -f	84	QMAKE_DEL_FILE = rm -f
85	QMAKE_DEL_DIR = rmdir	85	QMAKE_DEL_DIR = rmdir