1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index f47f74b..f9f88bb 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -49,73 +49,73 @@
        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 +DA2.0 -w $(CFLAGS_EXTRA)
        QMAKE_CFLAGS_WARN_ON=
        QMAKE_CFLAGS_WARN_OFF=
        QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Oentrysched +Onolimit)
        QMAKE_CFLAGS_DEBUG= -y -g
        QMAKE_CFLAGS_SHLIB= +Z
        QMAKE_CFLAGS_YACC=
        QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
        QMAKE_CXX       = aCC
        QMAKE_CXXFLAGS  = +DA2.0 -w -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= -g
        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    = +DA2.0 -Wl,+s $(LFLAGS_EXTRA)
        QMAKE_LFLAGS_RELEASE= -O
        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      = $(LIBS_EXTRA)
        QMAKE_LIBS_DYNLOAD= -ldld
        QMAKE_LIBS_X11  = -lXext -lX11
        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= -lpthread
        QMAKE_LIBS_YACC         = -ly
        QMAKE_MOC       = $(QTDIR)/bin/moc
        QMAKE_UIC       = $(QTDIR)/bin/uic
        QMAKE_AR        = ar cqs
        QMAKE_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/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index f47f74b..f9f88bb 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -49,73 +49,73 @@
49		49
50	MAKEFILE_GENERATOR= UNIX	50	MAKEFILE_GENERATOR= UNIX
51	TEMPLATE = app	51	TEMPLATE = app
52	CONFIG += qt warn_on release	52	CONFIG += qt warn_on release
53		53
54	QMAKE_CC = cc	54	QMAKE_CC = cc
55	QMAKE_LEX = flex	55	QMAKE_LEX = flex
56	QMAKE_LEXFLAGS =	56	QMAKE_LEXFLAGS =
57	QMAKE_YACC = yacc	57	QMAKE_YACC = yacc
58	QMAKE_YACCFLAGS = -d	58	QMAKE_YACCFLAGS = -d
59	QMAKE_CFLAGS = -Ae +DA2.0 -w $(CFLAGS_EXTRA)	59	QMAKE_CFLAGS = -Ae +DA2.0 -w $(CFLAGS_EXTRA)
60	QMAKE_CFLAGS_WARN_ON=	60	QMAKE_CFLAGS_WARN_ON=
61	QMAKE_CFLAGS_WARN_OFF=	61	QMAKE_CFLAGS_WARN_OFF=
62	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Oentrysched +Onolimit)	62	QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O +Oentrysched +Onolimit)
63	QMAKE_CFLAGS_DEBUG= -y -g	63	QMAKE_CFLAGS_DEBUG= -y -g
64	QMAKE_CFLAGS_SHLIB= +Z	64	QMAKE_CFLAGS_SHLIB= +Z
65	QMAKE_CFLAGS_YACC=	65	QMAKE_CFLAGS_YACC=
66	QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE	66	QMAKE_CFLAGS_THREAD= -D_POSIX_C_SOURCE=199506L -D_HPUX_SOURCE
67		67
68	QMAKE_CXX = aCC	68	QMAKE_CXX = aCC
69	QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)	69	QMAKE_CXXFLAGS = +DA2.0 -w -D__STRICT_ANSI__ $(CXXFLAGS_EXTRA)
70	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON	70	QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON
71	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF	71	QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF
72	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE	72	QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE
73	QMAKE_CXXFLAGS_DEBUG= -g	73	QMAKE_CXXFLAGS_DEBUG= -g
74	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB	74	QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB
75	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC	75	QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC
76	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD	76	QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD
77		77
78	QMAKE_INCDIR =	78	QMAKE_INCDIR =
79	QMAKE_LIBDIR =	79	QMAKE_LIBDIR =
80	QMAKE_INCDIR_X11= /usr/include/X11R6	80	QMAKE_INCDIR_X11= /usr/include/X11R6
81	QMAKE_LIBDIR_X11= /usr/lib/X11R6	81	QMAKE_LIBDIR_X11= /usr/lib/X11R6
82	QMAKE_INCDIR_QT = $(QTDIR)/include	82	QMAKE_INCDIR_QT = $(QTDIR)/include
83	QMAKE_LIBDIR_QT = $(QTDIR)/lib	83	QMAKE_LIBDIR_QT = $(QTDIR)/lib
84	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include	84	QMAKE_INCDIR_OPENGL= /opt/graphics/OpenGL/include /usr/contrib/X11R6/include
85	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib	85	QMAKE_LIBDIR_OPENGL= /opt/graphics/OpenGL/lib /usr/contrib/X11R6/lib
86		86
87	QMAKE_LINK = aCC	87	QMAKE_LINK = aCC
88	QMAKE_LINK_SHLIB= aCC	88	QMAKE_LINK_SHLIB= aCC
89	QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA)	89	QMAKE_LFLAGS = +DA2.0 -Wl,+s $(LFLAGS_EXTRA)
90	QMAKE_LFLAGS_RELEASE= -O	90	QMAKE_LFLAGS_RELEASE= -O
91	QMAKE_LFLAGS_DEBUG=	91	QMAKE_LFLAGS_DEBUG=
92	QMAKE_LFLAGS_SHLIB= -b	92	QMAKE_LFLAGS_SHLIB= -b
93	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB	93	QMAKE_LFLAGS_PLUGIN= $$QMAKE_LFLAGS_SHLIB
94	QMAKE_LFLAGS_SONAME= -Wl,+h,	94	QMAKE_LFLAGS_SONAME= -Wl,+h,
95	QMAKE_RPATH = -Wl,+b,	95	QMAKE_RPATH = -Wl,+b,
96		96
97	QMAKE_LIBS = -lm	97	QMAKE_LIBS = $(LIBS_EXTRA)
98	QMAKE_LIBS_DYNLOAD= -ldld	98	QMAKE_LIBS_DYNLOAD= -ldld
99	QMAKE_LIBS_X11 = -lXext -lX11	99	QMAKE_LIBS_X11 = -lXext -lX11
100	QMAKE_LIBS_X11SM= -lSM -lICE	100	QMAKE_LIBS_X11SM= -lSM -lICE
101	QMAKE_LIBS_QT = -lqt	101	QMAKE_LIBS_QT = -lqt
102	QMAKE_LIBS_QT_THREAD= -lqt-mt	102	QMAKE_LIBS_QT_THREAD= -lqt-mt
103		103
104	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu	104	QMAKE_LIBS_OPENGL= -lGLU -lGL -lXmu
105	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu	105	QMAKE_LIBS_OPENGL_QT= -lGL -lXmu
106	QMAKE_LIBS_THREAD= -lpthread	106	QMAKE_LIBS_THREAD= -lpthread
107	QMAKE_LIBS_YACC = -ly	107	QMAKE_LIBS_YACC = -ly
108		108
109	QMAKE_MOC = $(QTDIR)/bin/moc	109	QMAKE_MOC = $(QTDIR)/bin/moc
110	QMAKE_UIC = $(QTDIR)/bin/uic	110	QMAKE_UIC = $(QTDIR)/bin/uic
111		111
112	QMAKE_AR = ar cqs	112	QMAKE_AR = ar cqs
113	QMAKE_RANLIB =	113	QMAKE_RANLIB =
114		114
115	QMAKE_TAR = tar -cf	115	QMAKE_TAR = tar -cf
116	QMAKE_GZIP = gzip -9f	116	QMAKE_GZIP = gzip -9f
117		117
118	QMAKE_COPY = cp -f	118	QMAKE_COPY = cp -f
119	QMAKE_MOVE = mv -f	119	QMAKE_MOVE = mv -f
120	QMAKE_DEL_FILE = rm -f	120	QMAKE_DEL_FILE = rm -f
121	QMAKE_DEL_DIR = rmdir	121	QMAKE_DEL_DIR = rmdir