mirror of
https://github.com/genodelabs/genode.git
synced 2025-01-19 03:06:39 +00:00
Fix QtScriptTools compilation
Make the 'moc_*.cpp' and '*.moc' files dependencies of '$(SRC_CC:.cpp=.o)' to make sure that they get built. This patch fixes #99.
This commit is contained in:
Christian Prochaska
Norman Feske
parent
f72ab94853
commit
7690e5ad07
5
qt4/lib/mk/qt.mk
Normal file
5
qt4/lib/mk/qt.mk
Normal file
@ -0,0 +1,5 @@
|
||||
SRC_CC += $(filter %.cpp, $(QT_SOURCES))
|
||||
SRC_C += $(filter %.c, $(QT_SOURCES))
|
||||
|
||||
$(SRC_CC:.cpp=.o): $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
$(SRC_CC:.cpp=.o): $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
@ -9,7 +9,7 @@ QT_DEFINES += -DQT_BUILD_CORE_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII
|
||||
CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations
|
||||
|
||||
# extracted from src/corelib/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
qabstractanimation.cpp \
|
||||
qvariantanimation.cpp \
|
||||
qpropertyanimation.cpp \
|
||||
@ -200,12 +200,12 @@ SRC_CC = \
|
||||
# moc_qeventdispatcher_unix_p.cpp \
|
||||
|
||||
# add Genode-specific sources
|
||||
SRC_CC += qprocess_genode.cpp \
|
||||
qeventdispatcher_genode.cpp \
|
||||
qmutex_genode.cpp \
|
||||
qthread_genode.cpp \
|
||||
qwaitcondition_genode.cpp \
|
||||
moc_qeventdispatcher_genode_p.cpp
|
||||
QT_SOURCES += qprocess_genode.cpp \
|
||||
qeventdispatcher_genode.cpp \
|
||||
qmutex_genode.cpp \
|
||||
qthread_genode.cpp \
|
||||
qwaitcondition_genode.cpp \
|
||||
moc_qeventdispatcher_genode_p.cpp
|
||||
|
||||
# some source files need to be generated by moc from other source/header files before
|
||||
# they get #included again by the original source file in the compiling stage
|
||||
@ -254,8 +254,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qtextcodecplugin.cpp \
|
||||
moc_qstatemachine.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
@ -263,8 +261,6 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
qfilesystemwatcher.moc \
|
||||
qtimer.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4/QtCore/private \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
|
||||
@ -310,3 +306,5 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/cn
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/jp
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/kr
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/plugins/codecs/tw
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -10,7 +10,7 @@ QT_DEFINES += -DQT_NO_QWS_SIGNALHANDLER
|
||||
CC_WARN = -Wno-unused-but-set-variable -Wno-deprecated-declarations
|
||||
|
||||
# extracted from src/gui/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
qsoundqss_qws.cpp \
|
||||
qcopchannel_qws.cpp \
|
||||
qdecoration_qws.cpp \
|
||||
@ -476,14 +476,14 @@ SRC_CC = \
|
||||
qrc_qmessagebox.cpp
|
||||
|
||||
# add Genode-specific sources
|
||||
SRC_CC += qkbdpc101_qws.cpp \
|
||||
qwindowsurface_nitpicker_qws.cpp \
|
||||
moc_qwindowsurface_nitpicker_qws_p.cpp \
|
||||
qscreennitpicker_qws.cpp \
|
||||
qmousenitpicker_qws.cpp \
|
||||
qkbdnitpicker_qws.cpp \
|
||||
qinputnitpicker_qws.cpp \
|
||||
moc_qinputnitpicker_qws.cpp
|
||||
QT_SOURCES += qkbdpc101_qws.cpp \
|
||||
qwindowsurface_nitpicker_qws.cpp \
|
||||
moc_qwindowsurface_nitpicker_qws_p.cpp \
|
||||
qscreennitpicker_qws.cpp \
|
||||
qmousenitpicker_qws.cpp \
|
||||
qkbdnitpicker_qws.cpp \
|
||||
qinputnitpicker_qws.cpp \
|
||||
moc_qinputnitpicker_qws.cpp
|
||||
|
||||
# some source files need to be generated by moc from other source/header files before
|
||||
# they get #included again by the original source file in the compiling stage
|
||||
@ -683,8 +683,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qgraphicseffect.cpp \
|
||||
moc_qgraphicseffect_p.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" target
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
@ -709,8 +707,6 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
qdesktopservices.moc \
|
||||
qundoview.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
# UI headers
|
||||
qfiledialog.o: ui_qfiledialog.h
|
||||
|
||||
@ -765,3 +761,5 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/graphicsview
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/util
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/statemachine
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/gui/math3d
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -15,7 +15,7 @@ CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH
|
||||
CC_WARN =
|
||||
|
||||
# extracted from src/3rdparty/webkit/JavaScriptCore/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
pcre_compile.cpp \
|
||||
pcre_exec.cpp \
|
||||
pcre_tables.cpp \
|
||||
@ -182,16 +182,12 @@ SRC_CC = \
|
||||
# extracted from "compiler_moc_header_make_all" target
|
||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES =
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
MainThreadQt.moc \
|
||||
ThreadingQt.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
@ -282,3 +278,5 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/unicode
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/wtf/unicode/icu
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/yarr
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/JavaScriptCore/generated
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -9,7 +9,7 @@ QT_DEFINES += -DQT_BUILD_NETWORK_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASC
|
||||
CC_WARN =
|
||||
|
||||
# extracted from src/script/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
qftp.cpp \
|
||||
qhttp.cpp \
|
||||
qhttpnetworkheader.cpp \
|
||||
@ -119,8 +119,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qlocalserver.cpp \
|
||||
moc_qlocalsocket.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
@ -148,3 +146,5 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/network/access
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/network/bearer
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/network/kernel
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/network/socket
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -13,8 +13,8 @@ QT_DEFINES += -DJSC=QTJSC -Djscyyparse=qtjscyyparse -Djscyylex=qtjscyylex -Djscy
|
||||
CC_WARN =
|
||||
|
||||
# extracted from src/script/Makefile
|
||||
SRC_CC = \
|
||||
pcre_compile.cpp \
|
||||
QT_SOURCES = \
|
||||
pcre_compile.cpp \
|
||||
pcre_exec.cpp \
|
||||
pcre_tables.cpp \
|
||||
pcre_ucp_searchfuncs.cpp \
|
||||
@ -191,7 +191,7 @@ SRC_CC = \
|
||||
qscriptlexer.cpp \
|
||||
qscriptdate.cpp \
|
||||
moc_qscriptextensionplugin.cpp
|
||||
|
||||
|
||||
# some source files need to be generated by moc from other source/header files before
|
||||
# they get #included again by the original source file in the compiling stage
|
||||
|
||||
@ -202,15 +202,11 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qscriptextensionplugin.cpp \
|
||||
moc_qscriptqobject_p.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
MainThreadQt.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
@ -346,3 +342,5 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/script/api
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/script/bridge
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/script/parser
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/script/utils
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -9,7 +9,7 @@ QT_DEFINES += -DQT_BUILD_SCRIPT_LIB -DQT_NO_USING_NAMESPACE -DQLALR_NO_QSCRIPTGR
|
||||
CC_WARN =
|
||||
|
||||
# extracted from src/script/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
qscriptasm.cpp \
|
||||
qscriptast.cpp \
|
||||
qscriptastvisitor.cpp \
|
||||
@ -63,15 +63,11 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qscriptengine.cpp \
|
||||
moc_qscriptextensionplugin.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
qscriptextqobject.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/include \
|
||||
@ -92,3 +88,5 @@ vpath % $(REP_DIR)/include/qt4/QtScript/private
|
||||
vpath % $(REP_DIR)/src/lib/qt4/src/script
|
||||
|
||||
vpath % $(REP_DIR)/contrib/qtscriptclassic-1.0_1-opensource/src
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -2,8 +2,6 @@ include $(REP_DIR)/lib/import/import-qt_scripttools.mk
|
||||
|
||||
SHARED_LIB = yes
|
||||
|
||||
REQUIRES += deprecated
|
||||
|
||||
# extracted from src/script/Makefile
|
||||
QT_DEFINES += -DQT_BUILD_SCRIPTTOOLS_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_NO_DEBUG -DQT_SCRIPT_LIB -DQT_GUI_LIB -DQT_CORE_LIB
|
||||
|
||||
@ -11,83 +9,84 @@ QT_DEFINES += -DQT_BUILD_SCRIPTTOOLS_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO
|
||||
CC_WARN =
|
||||
|
||||
# extracted from src/script/Makefile
|
||||
SRC_CC = \
|
||||
qscriptdebuggervalue.cpp \
|
||||
qscriptdebuggervalueproperty.cpp \
|
||||
qscriptdebuggercommand.cpp \
|
||||
qscriptdebuggerresponse.cpp \
|
||||
qscriptdebuggerevent.cpp \
|
||||
qscriptdebuggercommandexecutor.cpp \
|
||||
qscriptdebuggercommandschedulerfrontend.cpp \
|
||||
qscriptdebuggerbackend.cpp \
|
||||
qscriptdebuggeragent.cpp \
|
||||
qscriptdebuggerfrontend.cpp \
|
||||
qscriptstdmessagehandler.cpp \
|
||||
qscriptenginedebuggerfrontend.cpp \
|
||||
qscriptdebuggerjob.cpp \
|
||||
qscriptdebuggercommandschedulerjob.cpp \
|
||||
qscriptvalueproperty.cpp \
|
||||
qscriptobjectsnapshot.cpp \
|
||||
qscriptscriptdata.cpp \
|
||||
qscriptxmlparser.cpp \
|
||||
qscriptbreakpointdata.cpp \
|
||||
qscriptdebugger.cpp \
|
||||
qscriptdebuggerconsole.cpp \
|
||||
qscriptdebuggerconsolecommand.cpp \
|
||||
qscriptdebuggerconsolecommandjob.cpp \
|
||||
qscriptdebuggerconsolecommandgroupdata.cpp \
|
||||
qscriptdebuggerconsolecommandmanager.cpp \
|
||||
qscriptcompletiontaskinterface.cpp \
|
||||
qscriptcompletiontask.cpp \
|
||||
qscriptdebuggerconsoleglobalobject.cpp \
|
||||
qscriptdebuggerscriptedconsolecommand.cpp \
|
||||
qscriptedit.cpp \
|
||||
qscriptsyntaxhighlighter.cpp \
|
||||
qscriptdebuggerconsolewidgetinterface.cpp \
|
||||
qscriptdebuggerconsolewidget.cpp \
|
||||
qscriptdebuggerstackwidgetinterface.cpp \
|
||||
qscriptdebuggerstackwidget.cpp \
|
||||
qscriptdebuggerstackmodel.cpp \
|
||||
qscriptdebuggerscriptswidgetinterface.cpp \
|
||||
qscriptdebuggerscriptswidget.cpp \
|
||||
qscriptdebuggerscriptsmodel.cpp \
|
||||
qscriptdebuggerlocalswidgetinterface.cpp \
|
||||
qscriptdebuggerlocalswidget.cpp \
|
||||
qscriptdebuggerlocalsmodel.cpp \
|
||||
qscriptdebuggercodewidgetinterface.cpp \
|
||||
qscriptdebuggercodewidget.cpp \
|
||||
qscriptdebuggercodeviewinterface.cpp \
|
||||
qscriptdebuggercodeview.cpp \
|
||||
qscriptdebuggercodefinderwidgetinterface.cpp \
|
||||
qscriptdebuggercodefinderwidget.cpp \
|
||||
qscriptdebugoutputwidgetinterface.cpp \
|
||||
qscriptdebugoutputwidget.cpp \
|
||||
qscriptbreakpointswidgetinterface.cpp \
|
||||
qscriptbreakpointswidget.cpp \
|
||||
qscriptbreakpointsmodel.cpp \
|
||||
qscripterrorlogwidgetinterface.cpp \
|
||||
qscripterrorlogwidget.cpp \
|
||||
qscriptenginedebugger.cpp \
|
||||
moc_qscriptcompletiontaskinterface_p.cpp \
|
||||
moc_qscriptcompletiontask_p.cpp \
|
||||
moc_qscriptdebuggerconsoleglobalobject_p.cpp \
|
||||
moc_qscriptedit_p.cpp \
|
||||
moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerstackwidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerscriptsmodel_p.cpp \
|
||||
moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerlocalsmodel_p.cpp \
|
||||
moc_qscriptdebuggercodewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggercodeviewinterface_p.cpp \
|
||||
moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
|
||||
moc_qscriptdebugoutputwidgetinterface_p.cpp \
|
||||
moc_qscriptdebugoutputwidget_p.cpp \
|
||||
moc_qscriptbreakpointswidgetinterface_p.cpp \
|
||||
moc_qscriptbreakpointsmodel_p.cpp \
|
||||
moc_qscripterrorlogwidgetinterface_p.cpp \
|
||||
moc_qscripterrorlogwidget_p.cpp \
|
||||
qrc_scripttools_debugging.cpp
|
||||
QT_SOURCES = \
|
||||
qscriptdebuggervalue.cpp \
|
||||
qscriptdebuggervalueproperty.cpp \
|
||||
qscriptdebuggercommand.cpp \
|
||||
qscriptdebuggerresponse.cpp \
|
||||
qscriptdebuggerevent.cpp \
|
||||
qscriptdebuggercommandexecutor.cpp \
|
||||
qscriptdebuggercommandschedulerfrontend.cpp \
|
||||
qscriptdebuggerbackend.cpp \
|
||||
qscriptdebuggeragent.cpp \
|
||||
qscriptdebuggerfrontend.cpp \
|
||||
qscriptstdmessagehandler.cpp \
|
||||
qscriptenginedebuggerfrontend.cpp \
|
||||
qscriptdebuggerjob.cpp \
|
||||
qscriptdebuggercommandschedulerjob.cpp \
|
||||
qscriptvalueproperty.cpp \
|
||||
qscriptobjectsnapshot.cpp \
|
||||
qscriptscriptdata.cpp \
|
||||
qscriptxmlparser.cpp \
|
||||
qscriptbreakpointdata.cpp \
|
||||
qscriptdebugger.cpp \
|
||||
qscriptdebuggerconsole.cpp \
|
||||
qscriptdebuggerconsolecommand.cpp \
|
||||
qscriptdebuggerconsolecommandjob.cpp \
|
||||
qscriptdebuggerconsolecommandgroupdata.cpp \
|
||||
qscriptdebuggerconsolecommandmanager.cpp \
|
||||
qscriptcompletiontaskinterface.cpp \
|
||||
qscriptcompletiontask.cpp \
|
||||
qscriptdebuggerconsoleglobalobject.cpp \
|
||||
qscriptdebuggerscriptedconsolecommand.cpp \
|
||||
qscriptedit.cpp \
|
||||
qscriptsyntaxhighlighter.cpp \
|
||||
qscriptdebuggerconsolewidgetinterface.cpp \
|
||||
qscriptdebuggerconsolewidget.cpp \
|
||||
qscriptdebuggerstackwidgetinterface.cpp \
|
||||
qscriptdebuggerstackwidget.cpp \
|
||||
qscriptdebuggerstackmodel.cpp \
|
||||
qscriptdebuggerscriptswidgetinterface.cpp \
|
||||
qscriptdebuggerscriptswidget.cpp \
|
||||
qscriptdebuggerscriptsmodel.cpp \
|
||||
qscriptdebuggerlocalswidgetinterface.cpp \
|
||||
qscriptdebuggerlocalswidget.cpp \
|
||||
qscriptdebuggerlocalsmodel.cpp \
|
||||
qscriptdebuggercodewidgetinterface.cpp \
|
||||
qscriptdebuggercodewidget.cpp \
|
||||
qscriptdebuggercodeviewinterface.cpp \
|
||||
qscriptdebuggercodeview.cpp \
|
||||
qscriptdebuggercodefinderwidgetinterface.cpp \
|
||||
qscriptdebuggercodefinderwidget.cpp \
|
||||
qscriptdebugoutputwidgetinterface.cpp \
|
||||
qscriptdebugoutputwidget.cpp \
|
||||
qscriptbreakpointswidgetinterface.cpp \
|
||||
qscriptbreakpointswidget.cpp \
|
||||
qscriptbreakpointsmodel.cpp \
|
||||
qscripterrorlogwidgetinterface.cpp \
|
||||
qscripterrorlogwidget.cpp \
|
||||
qscriptdebuggerstandardwidgetfactory.cpp \
|
||||
qscriptenginedebugger.cpp \
|
||||
moc_qscriptcompletiontaskinterface_p.cpp \
|
||||
moc_qscriptcompletiontask_p.cpp \
|
||||
moc_qscriptdebuggerconsoleglobalobject_p.cpp \
|
||||
moc_qscriptedit_p.cpp \
|
||||
moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerstackwidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerscriptsmodel_p.cpp \
|
||||
moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerlocalsmodel_p.cpp \
|
||||
moc_qscriptdebuggercodewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggercodeviewinterface_p.cpp \
|
||||
moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
|
||||
moc_qscriptdebugoutputwidgetinterface_p.cpp \
|
||||
moc_qscriptdebugoutputwidget_p.cpp \
|
||||
moc_qscriptbreakpointswidgetinterface_p.cpp \
|
||||
moc_qscriptbreakpointsmodel_p.cpp \
|
||||
moc_qscripterrorlogwidgetinterface_p.cpp \
|
||||
moc_qscripterrorlogwidget_p.cpp \
|
||||
qrc_scripttools_debugging.cpp
|
||||
|
||||
# some source files need to be generated by moc from other source/header files before
|
||||
# they get #included again by the original source file in the compiling stage
|
||||
@ -95,62 +94,49 @@ SRC_CC = \
|
||||
# source files generated from existing header files ("moc_%.cpp: %.h" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_header_make_all" target
|
||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qscriptdebugger_p.cpp \
|
||||
moc_qscriptcompletiontaskinterface_p.cpp \
|
||||
moc_qscriptcompletiontask_p.cpp \
|
||||
moc_qscriptdebuggerconsoleglobalobject_p.cpp \
|
||||
moc_qscriptedit_p.cpp \
|
||||
moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerconsolewidget_p.cpp \
|
||||
moc_qscriptdebuggerstackwidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerstackwidget_p.cpp \
|
||||
moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerscriptswidget_p.cpp \
|
||||
moc_qscriptdebuggerscriptsmodel_p.cpp \
|
||||
moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerlocalswidget_p.cpp \
|
||||
moc_qscriptdebuggerlocalsmodel_p.cpp \
|
||||
moc_qscriptdebuggercodewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggercodewidget_p.cpp \
|
||||
moc_qscriptdebuggercodeviewinterface_p.cpp \
|
||||
moc_qscriptdebuggercodeview_p.cpp \
|
||||
moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggercodefinderwidget_p.cpp \
|
||||
moc_qscriptdebugoutputwidgetinterface_p.cpp \
|
||||
moc_qscriptdebugoutputwidget_p.cpp \
|
||||
moc_qscriptbreakpointswidgetinterface_p.cpp \
|
||||
moc_qscriptbreakpointswidget_p.cpp \
|
||||
moc_qscriptbreakpointsmodel_p.cpp \
|
||||
moc_qscripterrorlogwidgetinterface_p.cpp \
|
||||
moc_qscripterrorlogwidget_p.cpp \
|
||||
moc_qscriptenginedebugger.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
moc_qscriptdebugger_p.cpp \
|
||||
moc_qscriptcompletiontaskinterface_p.cpp \
|
||||
moc_qscriptcompletiontask_p.cpp \
|
||||
moc_qscriptdebuggerconsoleglobalobject_p.cpp \
|
||||
moc_qscriptedit_p.cpp \
|
||||
moc_qscriptdebuggerconsolewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerconsolewidget_p.cpp \
|
||||
moc_qscriptdebuggerstackwidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerstackwidget_p.cpp \
|
||||
moc_qscriptdebuggerscriptswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerscriptswidget_p.cpp \
|
||||
moc_qscriptdebuggerscriptsmodel_p.cpp \
|
||||
moc_qscriptdebuggerlocalswidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggerlocalswidget_p.cpp \
|
||||
moc_qscriptdebuggerlocalsmodel_p.cpp \
|
||||
moc_qscriptdebuggercodewidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggercodewidget_p.cpp \
|
||||
moc_qscriptdebuggercodeviewinterface_p.cpp \
|
||||
moc_qscriptdebuggercodeview_p.cpp \
|
||||
moc_qscriptdebuggercodefinderwidgetinterface_p.cpp \
|
||||
moc_qscriptdebuggercodefinderwidget_p.cpp \
|
||||
moc_qscriptdebugoutputwidgetinterface_p.cpp \
|
||||
moc_qscriptdebugoutputwidget_p.cpp \
|
||||
moc_qscriptbreakpointswidgetinterface_p.cpp \
|
||||
moc_qscriptbreakpointswidget_p.cpp \
|
||||
moc_qscriptbreakpointsmodel_p.cpp \
|
||||
moc_qscripterrorlogwidgetinterface_p.cpp \
|
||||
moc_qscripterrorlogwidget_p.cpp \
|
||||
moc_qscriptenginedebugger.cpp
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
qscriptdebuggerconsolewidget.moc \
|
||||
qscriptdebuggerlocalswidget.moc \
|
||||
qscriptbreakpointswidget.moc \
|
||||
qscriptenginedebugger.moc
|
||||
qscriptdebuggerconsolewidget.moc \
|
||||
qscriptdebuggerlocalswidget.moc \
|
||||
qscriptbreakpointswidget.moc \
|
||||
qscriptenginedebugger.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
$(REP_DIR)/include/qt4/QtCore \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtCore \
|
||||
$(REP_DIR)/include/qt4/QtCore/private \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtCore/private \
|
||||
$(REP_DIR)/include/qt4/QtScript \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtScript \
|
||||
$(REP_DIR)/include/qt4/QtScript/private \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtScript/private \
|
||||
$(REP_DIR)/include/qt4/QtScriptTools/private \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtScriptTools/private \
|
||||
$(REP_DIR)/src/lib/qt4/src/corelib/global
|
||||
QT4_INC_DIR += $(REP_DIR)/include/qt4/QtScript/private \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtScript/private \
|
||||
$(REP_DIR)/include/qt4/QtScriptTools/private \
|
||||
$(REP_DIR)/contrib/$(QT4)/include/QtScriptTools/private \
|
||||
$(REP_DIR)/src/lib/qt4/src/corelib/global
|
||||
|
||||
LIBS += qt_core libc
|
||||
|
||||
@ -158,5 +144,6 @@ vpath % $(REP_DIR)/include/qt4/QtScriptTools
|
||||
vpath % $(REP_DIR)/include/qt4/QtScriptTools/private
|
||||
|
||||
vpath % $(REP_DIR)/src/lib/qt4/src/scripttools/debugging
|
||||
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/scripttools/debugging
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -7,7 +7,7 @@ QT_DEFINES += -DQT_BUILD_SVG_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -
|
||||
|
||||
# extracted from src/svg/Makefile
|
||||
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
qsvggraphics.cpp \
|
||||
qsvghandler.cpp \
|
||||
qsvgnode.cpp \
|
||||
@ -31,14 +31,10 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qsvgwidget.cpp \
|
||||
moc_qgraphicssvgitem.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" target
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
@ -65,3 +61,5 @@ vpath % $(REP_DIR)/include/qt4/QtSvg/private
|
||||
vpath % $(REP_DIR)/src/lib/qt4/src/svg
|
||||
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/svg
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -8,7 +8,7 @@ QT_DEFINES += -DQFORMINTERNAL_NAMESPACE -DQT_DESIGNER_STATIC -DQT_FORMBUILDER_NO
|
||||
CC_OPT += -Wno-unused-but-set-variable
|
||||
|
||||
# extracted from src/script/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
abstractformbuilder.cpp \
|
||||
formbuilder.cpp \
|
||||
ui4.cpp \
|
||||
@ -29,15 +29,11 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_properties_p.cpp \
|
||||
moc_quiloader.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
quiloader.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
@ -64,3 +60,5 @@ vpath % $(REP_DIR)/src/lib/qt4/tools/designer/src/uitools
|
||||
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/tools/designer/src/lib/uilib
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/tools/designer/src/uitools
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -18,7 +18,7 @@ CC_OPT_sqlite3 += -Wno-int-to-pointer-cast
|
||||
|
||||
# extracted from src/3rdparty/webkit/JavaScriptCore/Makefile
|
||||
# and src/3rdparty/webkit/WebCore/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
SVGNames.cpp \
|
||||
SVGElementFactory.cpp \
|
||||
JSSVGElementWrapperFactory.cpp \
|
||||
@ -1587,8 +1587,6 @@ COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
moc_qwebpluginfactory.cpp \
|
||||
moc_qwebinspector.cpp
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
@ -1596,8 +1594,6 @@ COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
InspectorClientQt.moc \
|
||||
GraphicsLayerQt.moc
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
@ -1868,3 +1864,5 @@ vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/notifications
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/accessibility
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/accessibility/qt
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/3rdparty/webkit/WebCore/websockets
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
@ -6,7 +6,7 @@ SHARED_LIB = yes
|
||||
QT_DEFINES += -DQT_BUILD_XML_LIB -DQT_NO_USING_NAMESPACE -DQT_NO_CAST_TO_ASCII -DQT_ASCII_CAST_WARNINGS -DQT_MOC_COMPAT -DQT_NO_DEBUG -DQT_CORE_LIB
|
||||
|
||||
# extracted from src/xml/Makefile
|
||||
SRC_CC = \
|
||||
QT_SOURCES = \
|
||||
qdom.cpp \
|
||||
qxml.cpp
|
||||
|
||||
@ -17,14 +17,10 @@ SRC_CC = \
|
||||
# extracted from "compiler_moc_header_make_all" target
|
||||
COMPILER_MOC_HEADER_MAKE_ALL_FILES = \
|
||||
|
||||
$(subst moc_,,$(COMPILER_MOC_HEADER_MAKE_ALL_FILES:.cpp=.o)) : $(COMPILER_MOC_HEADER_MAKE_ALL_FILES)
|
||||
|
||||
# source files generated from existing source files ("%.moc: %.cpp" rule in spec-qt4.mk)
|
||||
# extracted from "compiler_moc_source_make_all" rule
|
||||
COMPILER_MOC_SOURCE_MAKE_ALL_FILES = \
|
||||
|
||||
$(COMPILER_MOC_SOURCE_MAKE_ALL_FILES:.moc=.o) : $(COMPILER_MOC_SOURCE_MAKE_ALL_FILES)
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/lib/qt4/mkspecs/qws/genode-x86-g++ \
|
||||
$(REP_DIR)/include/qt4 \
|
||||
$(REP_DIR)/contrib/$(QT4)/include \
|
||||
@ -48,3 +44,5 @@ vpath % $(REP_DIR)/src/lib/qt4/src/xml/sax
|
||||
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/xml/dom
|
||||
vpath % $(REP_DIR)/contrib/$(QT4)/src/xml/sax
|
||||
|
||||
include $(REP_DIR)/lib/mk/qt.mk
|
||||
|
||||
Loading…
Reference in New Issue
Block a user