Add an easy means of passing in extra cflags, cxxflags, ldflags from the environment

1 files changed, 3 insertions, 3 deletions

diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index ba5d122..d7b01b7 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -11,111 +11,111 @@
 # 	an obsolescent form.
 # See pthread(3t) for more details.
 #
 # From the "HP aC++ Online Programmer's Guide":
 # 	When +DA2.0W is specified:
 # 	* 64-bit SVR4 Executable and Linking Format (ELF) object files
 # 	  are generated for PA-RISC 2.0. 
 # 	* The preprocessor predefined macro, __LP64__ is defined. 
 # 	* The correct path for 64-bit system and language libraries is
 # 	  selected.
 # 	When +DD32 is specified:
 # 	* The size of an int, long, or pointer data type is 32-bits. 
 # 	  The size of an int data type is 32-bits. The size of a long or
 # 	  pointer data type is 64-bits.
 # 	* This is the default, currently equivalent to +DA1.1 architecture.
 # 	When +DD64 is specified:
 # 	* The size of an int data type is 32-bits. The size of a long or
 # 	  pointer data type is 64-bits.
 # 	* This is currently equivalent to +DA2.OW architecture.
 # 	* The preprocessor predefined macro, __LP64__ is defined.
 # 	Using +DS to Specify Instruction Scheduling:
 # 	* By default, the compiler performs scheduling tuned for the system
 # 	  on which you are compiling, or, if specified, tuned for the setting
 # 	  of the +DA option.
 #
 # From the online "C/HP-UX Reference Manual":
 #	-Aa
 # 	  Enables strict ANSI C compliance.
 # 	-Ae
 # 	  Enables ANSI C compliance, HP value-added features (as described
 # 	  for +e option), and _HPUX_SOURCE name space macro. It is equivalent
 # 	  to -Aa +e -D_HPUX_SOURCE.
 # 	+e
 # 	  Enables the following HP value added features while compiling in
 # 	  ANSI C mode: sized enum, long long, long pointers, compiler supplied
 # 	  defaults for missing arguments to intrinsic calls, and $ in identifier
 # 	  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 +DA2.0 -w
+QMAKE_CFLAGS		= -Ae +DA2.0 -w $(CFLAGS_EXTRA)
 QMAKE_CFLAGS_WARN_ON	=
 QMAKE_CFLAGS_WARN_OFF	=
 QMAKE_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__
+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
+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_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