anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19613 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-08-16 19:05:42 +00:00
parent 81031b4cea
commit 6b61dd28e4
4 changed files with 67 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
development/qmake/app/app.pro
View File

@ -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}

1
development/qmake/config.pri
View File

@ -1,5 +1,6 @@
TEMPLATE = lib
CONFIG += staticlib
CONFIG += debug_and_release
#CONFIG += no_include_pwd

58
development/qmake/src/src.pro
View File

@ -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} }

57
development/qmake/support/support.pro
View File

@ -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} }