1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf
index a7f2b65..56e9057 100644
--- a/mkspecs/hpux-cc/qmake.conf
+++ b/mkspecs/hpux-cc/qmake.conf
@@ -27,54 +27,54 @@
        #   HP C extensions.
 #
        MAKEFILE_GENERATOR= UNIX
        TEMPLATE        = app
        CONFIG          += qt warn_on release
        QMAKE_CC        = cc
        QMAKE_LEX       = flex
        QMAKE_LEXFLAGS  = 
        QMAKE_YACC      = yacc
        QMAKE_YACCFLAGS         = -d
-        QMAKE_CFLAGS    = -Ae +DA1.1e -w
+        QMAKE_CFLAGS    = -Ae +DA1.1e -w $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF=
        QMAKE_CFLAGS_RELEASE= -O
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= +Z
        QMAKE_CFLAGS_YACC=
        QMAKE_CXX       = CC
-        QMAKE_CXXFLAGS  = +DA1.1e -w +a1
+        QMAKE_CXXFLAGS  = +DA1.1e -w +a1 $(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_INCDIR    =
        QMAKE_LIBDIR    =
        QMAKE_INCDIR_X11= /usr/include/X11R6
        QMAKE_LIBDIR_X11= /usr/lib/X11R6
        QMAKE_INCDIR_QT         = $(QTDIR)/include
        QMAKE_LIBDIR_QT         = $(QTDIR)/lib
        QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
        QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
        QMAKE_LINK      = CC
        QMAKE_LINK_SHLIB= CC
 # CC generates template code during linking, and so needs -I's
-        QMAKE_LFLAGS    = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT
+        QMAKE_LFLAGS    = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE= -O -s
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -b
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= -Wl,+h,
        QMAKE_RPATH     = -Wl,+b,
        QMAKE_LIBS      = -lm
        QMAKE_LIBS_DYNLOAD= -ldld
        QMAKE_LIBS_X11  = -lXext -lX11
        QMAKE_LIBS_X11SM= -lSM -lICE
        QMAKE_LIBS_QT   = -lqt

diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf index a7f2b65..56e9057 100644 --- a/mkspecs/hpux-cc/qmake.conf +++ b/mkspecs/hpux-cc/qmake.conf
@@ -27,54 +27,54 @@
27	# HP C extensions.	27	# HP C extensions.
28	#	28	#
29		29
30	MAKEFILE_GENERATOR= UNIX	30	MAKEFILE_GENERATOR= UNIX
31	TEMPLATE = app	31	TEMPLATE = app
32	CONFIG += qt warn_on release	32	CONFIG += qt warn_on release
33		33
34	QMAKE_CC = cc	34	QMAKE_CC = cc
35	QMAKE_LEX = flex	35	QMAKE_LEX = flex
36	QMAKE_LEXFLAGS =	36	QMAKE_LEXFLAGS =
37	QMAKE_YACC = yacc	37	QMAKE_YACC = yacc
38	QMAKE_YACCFLAGS = -d	38	QMAKE_YACCFLAGS = -d
39	QMAKE_CFLAGS = -Ae +DA1.1e -w	39	QMAKE_CFLAGS = -Ae +DA1.1e -w $(CFLAGS_EXTRA)
40	QMAKE_CFLAGS_WARN_ON=	40	QMAKE_CFLAGS_WARN_ON=
41	QMAKE_CFLAGS_WARN_OFF=	41	QMAKE_CFLAGS_WARN_OFF=
42	QMAKE_CFLAGS_RELEASE= -O	42	QMAKE_CFLAGS_RELEASE= -O
43	QMAKE_CFLAGS_DEBUG= -g	43	QMAKE_CFLAGS_DEBUG= -g
44	QMAKE_CFLAGS_SHLIB= +Z	44	QMAKE_CFLAGS_SHLIB= +Z
45	QMAKE_CFLAGS_YACC=	45	QMAKE_CFLAGS_YACC=
46		46
47	QMAKE_CXX = CC	47	QMAKE_CXX = CC
48	QMAKE_CXXFLAGS = +DA1.1e -w +a1	48	QMAKE_CXXFLAGS = +DA1.1e -w +a1 $(CXXFLAGS_EXTRA)
49	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	49	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
50	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	50	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
51	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	51	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
52	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG	52	QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG
53	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	53	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
54	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	54	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
55		55
56	QMAKE_INCDIR =	56	QMAKE_INCDIR =
57	QMAKE_LIBDIR =	57	QMAKE_LIBDIR =
58	QMAKE_INCDIR_X11= /usr/include/X11R6	58	QMAKE_INCDIR_X11= /usr/include/X11R6
59	QMAKE_LIBDIR_X11= /usr/lib/X11R6	59	QMAKE_LIBDIR_X11= /usr/lib/X11R6
60	QMAKE_INCDIR_QT = $(QTDIR)/include	60	QMAKE_INCDIR_QT = $(QTDIR)/include
61	QMAKE_LIBDIR_QT = $(QTDIR)/lib	61	QMAKE_LIBDIR_QT = $(QTDIR)/lib
62	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include	62	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
63	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib	63	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
64		64
65	QMAKE_LINK = CC	65	QMAKE_LINK = CC
66	QMAKE_LINK_SHLIB= CC	66	QMAKE_LINK_SHLIB= CC
67	# CC generates template code during linking, and so needs -I's	67	# CC generates template code during linking, and so needs -I's
68	QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT	68	QMAKE_LFLAGS = +DA1.1e -Wl,+s -L/usr/lib -I$$QMAKE_INCDIR_X11 -I$$QMAKE_INCDIR_QT $(LFLAGS_EXTRA)
69	QMAKE_LFLAGS_RELEASE= -O -s	69	QMAKE_LFLAGS_RELEASE= -O -s
70	QMAKE_LFLAGS_DEBUG=	70	QMAKE_LFLAGS_DEBUG=
71	QMAKE_LFLAGS_SHLIB= -b	71	QMAKE_LFLAGS_SHLIB= -b
72	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	72	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
73	QMAKE_LFLAGS_SONAME= -Wl,+h,	73	QMAKE_LFLAGS_SONAME= -Wl,+h,
74	QMAKE_RPATH = -Wl,+b,	74	QMAKE_RPATH = -Wl,+b,
75		75
76	QMAKE_LIBS = -lm	76	QMAKE_LIBS = -lm
77	QMAKE_LIBS_DYNLOAD= -ldld	77	QMAKE_LIBS_DYNLOAD= -ldld
78	QMAKE_LIBS_X11 = -lXext -lX11	78	QMAKE_LIBS_X11 = -lXext -lX11
79	QMAKE_LIBS_X11SM= -lSM -lICE	79	QMAKE_LIBS_X11SM= -lSM -lICE
80	QMAKE_LIBS_QT = -lqt	80	QMAKE_LIBS_QT = -lqt