1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index 7218fee..5990aa7 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -26,55 +26,55 @@
        #   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 +DAportable -w +Z
+        QMAKE_CFLAGS    = -Ae +DAportable -w +Z $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF=
        QMAKE_CFLAGS_RELEASE= -O
        QMAKE_CFLAGS_DEBUG= -g
        QMAKE_CFLAGS_SHLIB= 
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
        QMAKE_CXX       = aCC
-        QMAKE_CXXFLAGS  = +DAportable -w +Z -D__STRICT_ANSI__
+        QMAKE_CXXFLAGS  = +DAportable -w +Z -D__STRICT_ANSI__ $(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= /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      = aCC
        QMAKE_LINK_SHLIB= aCC
-        QMAKE_LFLAGS    = +DAportable -Wl,+s
+        QMAKE_LFLAGS    = +DAportable -Wl,+s $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE= -O
        QMAKE_LFLAGS_DEBUG=
        QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
        QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
        QMAKE_LFLAGS_SONAME= -Wl,+h,
        QMAKE_LFLAGS_THREAD=
        QMAKE_RPATH     = -Wl,+b,
        QMAKE_LIBS      = -lm
        QMAKE_LIBS_DYNLOAD= -ldld
        QMAKE_LIBS_X11  = -lXext -lX11
        QMAKE_LIBS_X11SM= -lSM -lICE

diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index 7218fee..5990aa7 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf
@@ -26,55 +26,55 @@
26	# HP C extensions.	26	# HP C extensions.
27	#	27	#
28		28
29	MAKEFILE_GENERATOR= UNIX	29	MAKEFILE_GENERATOR= UNIX
30	TEMPLATE = app	30	TEMPLATE = app
31	CONFIG = qt warn_on release	31	CONFIG = qt warn_on release
32		32
33	QMAKE_CC = cc	33	QMAKE_CC = cc
34	QMAKE_LEX = flex	34	QMAKE_LEX = flex
35	QMAKE_LEXFLAGS =	35	QMAKE_LEXFLAGS =
36	QMAKE_YACC = yacc	36	QMAKE_YACC = yacc
37	QMAKE_YACCFLAGS = -d	37	QMAKE_YACCFLAGS = -d
38	QMAKE_CFLAGS = -Ae +DAportable -w +Z	38	QMAKE_CFLAGS = -Ae +DAportable -w +Z $(CFLAGS_EXTRA)
39	QMAKE_CFLAGS_WARN_ON=	39	QMAKE_CFLAGS_WARN_ON=
40	QMAKE_CFLAGS_WARN_OFF=	40	QMAKE_CFLAGS_WARN_OFF=
41	QMAKE_CFLAGS_RELEASE= -O	41	QMAKE_CFLAGS_RELEASE= -O
42	QMAKE_CFLAGS_DEBUG= -g	42	QMAKE_CFLAGS_DEBUG= -g
43	QMAKE_CFLAGS_SHLIB=	43	QMAKE_CFLAGS_SHLIB=
44	QMAKE_CFLAGS_YACC=	44	QMAKE_CFLAGS_YACC=
45	QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE	45	QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
46		46
47	QMAKE_CXX = aCC	47	QMAKE_CXX = aCC
48	QMAKE_CXXFLAGS = +DAportable -w +Z -D__STRICT_ANSI__	48	QMAKE_CXXFLAGS = +DAportable -w +Z -D__STRICT_ANSI__ $(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	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	55	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
56		56
57	QMAKE_INCDIR =	57	QMAKE_INCDIR =
58	QMAKE_LIBDIR =	58	QMAKE_LIBDIR =
59	QMAKE_INCDIR_X11= /usr/include/X11R6	59	QMAKE_INCDIR_X11= /usr/include/X11R6
60	QMAKE_LIBDIR_X11= /usr/lib/X11R6	60	QMAKE_LIBDIR_X11= /usr/lib/X11R6
61	QMAKE_INCDIR_QT = $(QTDIR)/include	61	QMAKE_INCDIR_QT = $(QTDIR)/include
62	QMAKE_LIBDIR_QT = $(QTDIR)/lib	62	QMAKE_LIBDIR_QT = $(QTDIR)/lib
63	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include	63	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
64	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib	64	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
65		65
66	QMAKE_LINK = aCC	66	QMAKE_LINK = aCC
67	QMAKE_LINK_SHLIB= aCC	67	QMAKE_LINK_SHLIB= aCC
68	QMAKE_LFLAGS = +DAportable -Wl,+s	68	QMAKE_LFLAGS = +DAportable -Wl,+s $(LFLAGS_EXTRA)
69	QMAKE_LFLAGS_RELEASE= -O	69	QMAKE_LFLAGS_RELEASE= -O
70	QMAKE_LFLAGS_DEBUG=	70	QMAKE_LFLAGS_DEBUG=
71	QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared	71	QMAKE_LFLAGS_SHLIB= -b -Wl,-a,shared
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_LFLAGS_THREAD=	74	QMAKE_LFLAGS_THREAD=
75	QMAKE_RPATH = -Wl,+b,	75	QMAKE_RPATH = -Wl,+b,
76		76
77	QMAKE_LIBS = -lm	77	QMAKE_LIBS = -lm
78	QMAKE_LIBS_DYNLOAD= -ldld	78	QMAKE_LIBS_DYNLOAD= -ldld
79	QMAKE_LIBS_X11 = -lXext -lX11	79	QMAKE_LIBS_X11 = -lXext -lX11
80	QMAKE_LIBS_X11SM= -lSM -lICE	80	QMAKE_LIBS_X11SM= -lSM -lICE