mkspecs: Sync freebsd-g++40 and freebsd-g++.

Make freebsd-g++40 include gcc-base-unix.conf and g++-unix.conf and
eliminate a lot of duplicate definitions.

Change-Id: Ib3fe572ee276645fb03034a08fbc8e06720b6372
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/mkspecs/freebsd-g++40/qmake.conf b/mkspecs/freebsd-g++40/qmake.conf
index 331c267..b242f9a 100644 (file)
--- a/mkspecs/freebsd-g++40/qmake.conf
+++ b/mkspecs/freebsd-g++40/qmake.conf
@@ -8,34 +8,14 @@ TEMPLATE              = app
 CONFIG                 += qt warn_on release link_prl gdb_dwarf_index
 QT                     += core gui
 
-QMAKE_CC               = gcc40
-QMAKE_LEX              = flex
-QMAKE_LEXFLAGS         =
-QMAKE_YACC             = yacc
-QMAKE_YACCFLAGS                = -d
-QMAKE_CFLAGS           = -pipe
-QMAKE_CFLAGS_DEPS      = -M
-QMAKE_CFLAGS_WARN_ON   = -Wall -W
-QMAKE_CFLAGS_WARN_OFF  = -w
-QMAKE_CFLAGS_RELEASE   = -O2
-QMAKE_CFLAGS_DEBUG     = -g
-QMAKE_CFLAGS_SHLIB     = -fPIC
-QMAKE_CFLAGS_STATIC_LIB        = $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD    = -pthread -D_THREAD_SAFE
 
-QMAKE_CXX              = g++40
-QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
-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_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC    = $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD  = $$QMAKE_CFLAGS_THREAD
 
+QMAKE_CC = gcc40
+
+QMAKE_CXX = g++40
+
 # Addon software goes into /usr/local on the BSDs, by default we will look there
 QMAKE_INCDIR           = /usr/local/include
 QMAKE_LIBDIR           = /usr/local/lib
@@ -46,18 +26,7 @@ QMAKE_LIBDIR_QT              = $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL    = /usr/X11R6/include
 QMAKE_LIBDIR_OPENGL    = /usr/X11R6/lib
 
-QMAKE_LINK             = g++40
-QMAKE_LINK_SHLIB       = g++40
-QMAKE_LINK_C           = gcc40
-QMAKE_LINK_C_SHLIB     = gcc40
-QMAKE_LFLAGS           =
-QMAKE_LFLAGS_RELEASE   =
-QMAKE_LFLAGS_DEBUG     =
-QMAKE_LFLAGS_SHLIB     = -shared
-QMAKE_LFLAGS_PLUGIN    = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME    = -Wl,-soname,
 QMAKE_LFLAGS_THREAD    = -pthread
-QMAKE_LFLAGS_RPATH     = -Wl,-rpath,
 
 QMAKE_LIBS             =
 QMAKE_LIBS_DYNLOAD     =
@@ -81,4 +50,6 @@ QMAKE_DEL_DIR         = rmdir
 QMAKE_CHK_DIR_EXISTS   = test -d
 QMAKE_MKDIR            = mkdir -p
 include(../common/unix.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
 load(qt_config)