configure: put more of the makefile contents into template files

... instead of having (duplicated) code in the configures to create it.

Change-Id: Ia86b44021a024a969f5a49b7fb18d3d414869f93
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 15 insertions, 59 deletions

diff --git a/configure b/configure
index 5a5f564abb..bc18e614d2 100755
--- a/configure
+++ b/configure
@@ -1631,8 +1631,6 @@ setBootstrapVariable()
         echo "########################################################################" > "$mkfile"
         echo "## This file was autogenerated by configure, all changes will be lost ##" >> "$mkfile"
         echo "########################################################################" >> "$mkfile"
-        EXTRA_OBJS=
-        EXTRA_SRCS=
         EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) \$(QMAKE_CXXFLAGS_CXX11) \$(QMAKE_CXXFLAGS_SPLIT_SECTIONS)"
         EXTRA_LFLAGS="\$(QMAKE_LFLAGS) \$(QMAKE_LFLAGS_GCSECTIONS)"
 
@@ -1657,58 +1655,6 @@ setBootstrapVariable()
             EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
         fi
 
-        case `basename "$PLATFORM"` in
-        win32-g++*)
-            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE"
-            EXTRA_OBJS="qfilesystemengine_win.o \
-                        qfilesystemiterator_win.o \
-                        qfsfileengine_win.o \
-                        qlocale_win.o \
-                        qsettings_win.o \
-                        qsystemlibrary.o \
-                        registry.o"
-            EXTRA_SRCS="\"\$(SOURCE_PATH)/src/corelib/corelib/io/qfilesystemengine_win.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp\" \
-                        \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\""
-            EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32"
-            EXEEXT=".exe"
-            ;;
-        *)
-            EXTRA_OBJS="qfilesystemengine_unix.o \
-                        qfilesystemiterator_unix.o \
-                        qfsfileengine_unix.o \
-                        qlocale_unix.o"
-            EXTRA_SRCS="\"\$(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_unix.cpp\""
-            EXEEXT=
-            ;;
-        esac
-        if [ "$BUILD_ON_MAC" = "yes" ]; then
-            echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
-            echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
-            echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile"
-            EXTRA_LFLAGS="$EXTRA_LFLAGS \$(COCOA_LFLAGS)"
-            EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)"
-            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)"
-            EXTRA_OBJS="$EXTRA_OBJS \
-                        qsettings_mac.o \
-                        qcore_mac.o \
-                        qcore_mac_objc.o \
-                        qcore_foundation.o"
-            EXTRA_SRCS="$EXTRA_SRCS \
-                        \"\$(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac.cpp\" \
-                        \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_mac_objc.mm\" \
-                        \"\$(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm\""
-        fi
-
-        echo >>"$mkfile"
 	adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'`
 	adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'`
 	adjqmakespec=`echo "$QMAKESPEC" | sed 's/ /\\\\\\\\ /g'`
@@ -1725,14 +1671,24 @@ setBootstrapVariable()
         echo "QT_MAJOR_VERSION = $QT_MAJOR_VERSION" >> "$mkfile"
         echo "QT_MINOR_VERSION = $QT_MINOR_VERSION" >> "$mkfile"
         echo "QT_PATCH_VERSION = $QT_PATCH_VERSION" >> "$mkfile"
-        echo "EXTRA_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile"
-        echo "QTOBJS =" $EXTRA_OBJS >> "$mkfile"
-        echo "QTSRCS =" $EXTRA_SRCS >> "$mkfile"
-        echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile"
-        echo "EXEEXT = $EXEEXT" >> "$mkfile"
+        echo "CONFIG_CXXFLAGS = $EXTRA_CXXFLAGS" >> "$mkfile"
+        echo "CONFIG_LFLAGS = $EXTRA_LFLAGS" >> "$mkfile"
         echo "RM_F = rm -f" >> "$mkfile"
         echo "RM_RF = rm -rf" >> "$mkfile"
 
+        case `basename "$PLATFORM"` in
+        win32-g++*)
+            cat "$in_mkfile.win32" >> "$mkfile"
+            ;;
+        *)
+            cat "$in_mkfile.unix" >> "$mkfile"
+            if [ "$BUILD_ON_MAC" = "yes" ]; then
+                cat "$in_mkfile.macos" >> "$mkfile"
+            fi
+            ;;
+        esac
+        echo >>"$mkfile"
+
         if [ "$BUILD_ON_MAC" = "yes" ]; then
             echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile"
             cat "$in_mkfile" >> "$mkfile"