--with-qmake: move special Package.cpp handling from src/src.pro to support/support.pro

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19613 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/qmake/app/app.pro b/development/qmake/app/app.pro
index 0d6b83380790168968c0f25e306a4b079d69eb20..626f5662045fb4415aca6a7294e08209f09595ab 100644 (file)
--- a/development/qmake/app/app.pro
+++ b/development/qmake/app/app.pro
@@ -3,6 +3,8 @@ include(../config.pri)
 
 TEMPLATE = app
 
+QT = core gui
+
 DESTDIR = ../bin
 
 TARGET = lyx$${DEBUGSUFFIX}
@@ -18,12 +20,17 @@ CONFIG += debug_and_release
 LIBS += -lAiksaurus
 
 LIBS += -L../lib
+
+LIBS += ../support/$(OBJECTS_DIR)/Package.o
+LIBS += -Wl,--start-group
 LIBS += -llyxmathed$${DEBUGSUFFIX}
 LIBS += -llyxinsets$${DEBUGSUFFIX}
 LIBS += -llyxgraphics$${DEBUGSUFFIX}
-LIBS += -llyxsupport$${DEBUGSUFFIX}
 LIBS += -llyxfrontends$${DEBUGSUFFIX}
 LIBS += -llyxcontrollers$${DEBUGSUFFIX}
 LIBS += -llyxqt4$${DEBUGSUFFIX}
-LIBS += -llyxboost$${DEBUGSUFFIX}
 LIBS += -llyxsrc$${DEBUGSUFFIX}
+LIBS += -llyxsupport$${DEBUGSUFFIX}
+LIBS += -Wl,--end-group
+
+LIBS += -llyxboost$${DEBUGSUFFIX}

diff --git a/development/qmake/config.pri b/development/qmake/config.pri
index 3e813ea2d4d808b7727c832a0c643565407c26d7..6ea522b2510204a15c5994dee4cdc6e359aa10be 100644 (file)
--- a/development/qmake/config.pri
+++ b/development/qmake/config.pri
@@ -1,5 +1,6 @@
 
 TEMPLATE = lib
+CONFIG += staticlib
 
 CONFIG += debug_and_release
 #CONFIG += no_include_pwd

diff --git a/development/qmake/src/src.pro b/development/qmake/src/src.pro
index b7d8fa6b7dab3e688ee02e5583b36070a45def6b..ced3a40562a175b6af593acba7f0e69aced9e793 100644 (file)
--- a/development/qmake/src/src.pro
+++ b/development/qmake/src/src.pro
@@ -229,64 +229,6 @@ CPP += Thesaurus.cpp
 BASE = $${BUILD_BASE_SOURCE_DIR}/src/frontends/qt4
 
 
-QMAKE_RUN_CXX1  = $(CXX) -c $(CXXFLAGS) $(INCPATH)
-
-#packagetarget.target = Package.cpp
-#packagetarget.commands = \
-#      @rm -f tmp_package ;\
-#      sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
-#s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
-#s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
-#s,@PROGRAM_SUFFIX@,$(program_suffix),\' \
-#              $${BUILD_BASE_SOURCE_DIR}/src/support/Package.cpp.in > tmp_package ;\
-#      if cmp -s tmp_package Package.cpp ; then \
-#              rm -f tmp_package ;\
-#      else \
-#              rm -f Package.cpp ;\
-#              cp tmp_package Package.cpp ;\
-#      fi
-#packagetarget.depends = config.h
-#packagetarget.variable_out = SOURCES
-#packagetarget.CONFIG = no_link
-##SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp
-#QMAKE_EXTRA_TARGETS += packagetarget
-#
-##OBJECTS += $(OBJECTS_DIR)/Package.o 
-#POST_TARGETDEPS += $(OBJECTS_DIR)/Package.o 
-
-packagetarget.target = Package.cpp
-packagetarget.commands = \
-       @rm -f tmp_package ;\
-       sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
-s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
-s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
-s,@PROGRAM_SUFFIX@,$(program_suffix),\' \
-               $${BUILD_BASE_SOURCE_DIR}/src/support/Package.cpp.in > tmp_package ;\
-       if cmp -s tmp_package Package.cpp ; then \
-               rm -f tmp_package ;\
-       else \
-               rm -f Package.cpp ;\
-               cp tmp_package Package.cpp ;\
-       fi
-packagetarget.depends = config.h
-packagetarget.CONFIG = no_link
-#SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp
- 
-packagetarget2.target = Package.o
-packagetarget2.commands = $${QMAKE_RUN_CXX1} -c Package.cpp -o Package.o
-packagetarget2.depends = Package.cpp config.h
- 
-QMAKE_EXTRA_TARGETS += configtarget
-QMAKE_EXTRA_TARGETS += versiontarget versiontarget2
-QMAKE_EXTRA_TARGETS += packagetarget packagetarget2
- 
-QMAKE_CLEAN += Package.o Package.cpp
-
-PRE_TARGETDEPS += Package.o 
-
-LIBS += Package.o
-
-
 for(FILE,CPP) { SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} }
 for(FILE,HPP) { HEADERS += $${BUILD_BASE_SOURCE_DIR}/src/$${FILE} }
 for(PATH,INC) { INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/$${PATH} }

diff --git a/development/qmake/support/support.pro b/development/qmake/support/support.pro
index 2a6e1a5114310e3cbb7e796b28b553e521d8cc47..d4dcf9a4ae0d51f09f13bca0bbf41939d3e74cc2 100644 (file)
--- a/development/qmake/support/support.pro
+++ b/development/qmake/support/support.pro
@@ -84,6 +84,63 @@ CPP += unicode.cpp
 CPP += unlink.cpp
 CPP += userinfo.cpp
 
+
+QMAKE_RUN_CXX1  = $(CXX) -c $(CXXFLAGS) $(INCPATH)
+
+#packagetarget.target = Package.cpp
+#packagetarget.commands = \
+#      @rm -f tmp_package ;\
+#      sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
+#s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
+#s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
+#s,@PROGRAM_SUFFIX@,$(program_suffix),\' \
+#              $${BUILD_BASE_SOURCE_DIR}/src/support/Package.cpp.in > tmp_package ;\
+#      if cmp -s tmp_package Package.cpp ; then \
+#              rm -f tmp_package ;\
+#      else \
+#              rm -f Package.cpp ;\
+#              cp tmp_package Package.cpp ;\
+#      fi
+#packagetarget.depends = config.h
+#packagetarget.variable_out = SOURCES
+#packagetarget.CONFIG = no_link
+##SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp
+#QMAKE_EXTRA_TARGETS += packagetarget
+#
+##OBJECTS += $(OBJECTS_DIR)/Package.o 
+#POST_TARGETDEPS += $(OBJECTS_DIR)/Package.o 
+
+packagetarget.target = Package.cpp
+packagetarget.commands = \
+       @rm -f tmp_package ;\
+       sed \'s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
+s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
+s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
+s,@PROGRAM_SUFFIX@,$(program_suffix),\' \
+               $${BUILD_BASE_SOURCE_DIR}/src/support/Package.cpp.in > tmp_package ;\
+       if cmp -s tmp_package Package.cpp ; then \
+               rm -f tmp_package ;\
+       else \
+               rm -f Package.cpp ;\
+               cp tmp_package Package.cpp ;\
+       fi
+#packagetarget.depends = config.h
+packagetarget.CONFIG = no_link
+#SOURCES += $${BUILD_BASE_TARGET_DIR}/src/Package.cpp
+ 
+packagetarget2.target = $(OBJECTS_DIR)/Package.o
+packagetarget2.commands = $${QMAKE_RUN_CXX1} -c Package.cpp \
+       -o $(OBJECTS_DIR)/Package.o
+packagetarget2.depends = Package.cpp
+ 
+QMAKE_EXTRA_TARGETS += packagetarget packagetarget2
+ 
+QMAKE_CLEAN += $(OBJECTS_DIR)/Package.o Package.cpp
+
+PRE_TARGETDEPS += $(OBJECTS_DIR)/Package.o 
+
+LIBS += $(OBJECTS_DIR)/Package.o
+
 for(FILE,CPP) { SOURCES += $${BUILD_BASE_SOURCE_DIR}/src/support/$${FILE} }
 for(FILE,HPP) { HEADERS += $${BUILD_BASE_SOURCE_DIR}/src/support/$${FILE} }
 for(PATH,INC) { INCLUDEPATH += $${BUILD_BASE_SOURCE_DIR}/$${PATH} }