Fix LSB mkspec

Use the standard g++ specs, just override the compiler name

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

diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf
index 4197db0..4335f5a 100644 (file)
--- a/mkspecs/linux-lsb-g++/qmake.conf
+++ b/mkspecs/linux-lsb-g++/qmake.conf
@@ -2,96 +2,18 @@
 # qmake configuration for linux-g++
 #
 
-MAKEFILE_GENERATOR     = UNIX
-TARGET_PLATFORM                = unix
-TEMPLATE               = app
-CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
-QT                     += core gui
+MAKEFILE_GENERATOR      = UNIX
+TARGET_PLATFORM         = unix
+TEMPLATE                = app
+CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+QT                      += core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
-QMAKE_CC               = lsbcc
-QMAKE_LEX              = flex
-QMAKE_LEXFLAGS         =
-QMAKE_YACC             = yacc
-QMAKE_YACCFLAGS                = -d
-QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
-QMAKE_YACC_HEADER       = $base.tab.h
-QMAKE_YACC_SOURCE       = $base.tab.c
-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    = -D_REENTRANT
-QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+include(../common/linux.conf)
+include(../common/gcc-base-unix.conf)
+include(../common/g++-unix.conf)
+load(qt_config)
 
 QMAKE_LSB               = 1
-
+QMAKE_CC                = lsbcc
 QMAKE_CXX              = lsbc++
-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_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
-
-QMAKE_INCDIR           =
-QMAKE_LIBDIR           =
-QMAKE_INCDIR_X11       = /opt/lsb/include
-QMAKE_LIBDIR_X11       = /opt/lsb/lib
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
-QMAKE_INCDIR_OPENGL    = /opt/lsb/include
-QMAKE_LIBDIR_OPENGL    = /opt/lsb/lib
-
-QMAKE_LINK             = lsbc++
-QMAKE_LINK_SHLIB       = lsbc++
-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    =
-QMAKE_LFLAGS_RPATH     = -Wl,-rpath,
-
-QMAKE_LIBS             =
-QMAKE_LIBS_DYNLOAD     = -ldl
-QMAKE_LIBS_X11         = -lXext -lX11 -lm
-QMAKE_LIBS_X11SM       = -lSM -lICE
-QMAKE_LIBS_NIS         = -lnsl
-QMAKE_LIBS_OPENGL      = -lGL
-QMAKE_LIBS_OPENGL_QT   = -lGL
-QMAKE_LIBS_THREAD      = -lpthread
-
-QMAKE_MOC              = $$[QT_INSTALL_BINS]/moc
-QMAKE_UIC              = $$[QT_INSTALL_BINS]/uic
-
-QMAKE_AR               = ar cqs
-QMAKE_OBJCOPY           = objcopy
-QMAKE_RANLIB           =
-
-QMAKE_TAR              = tar -cf
-QMAKE_GZIP             = gzip -9f
-
-QMAKE_COPY             = cp -f
-QMAKE_COPY_FILE         = $(COPY)
-QMAKE_COPY_DIR          = $(COPY) -r
-QMAKE_MOVE             = mv -f
-QMAKE_DEL_FILE         = rm -f
-QMAKE_DEL_DIR          = rmdir
-QMAKE_STRIP             = strip
-QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS   = test -d
-QMAKE_MKDIR            = mkdir -p
-include(../common/unix.conf)
-load(qt_config)