From 6b61dd28e4afc6d0d9f63183a8d6514a740034f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Thu, 16 Aug 2007 19:05:42 +0000 Subject: [PATCH] --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 --- development/qmake/app/app.pro | 11 ++++- development/qmake/config.pri | 1 + development/qmake/src/src.pro | 58 --------------------------- development/qmake/support/support.pro | 57 ++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 60 deletions(-) diff --git a/development/qmake/app/app.pro b/development/qmake/app/app.pro index 0d6b833807..626f566204 100644 --- 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 3e813ea2d4..6ea522b251 100644 --- 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 b7d8fa6b7d..ced3a40562 100644 --- 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 2a6e1a5114..d4dcf9a4ae 100644 --- 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} } -- 2.39.2