octave: libgui/qterminal/module.mk annotate

annotate libgui/qterminal/module.mk @ 27648:2952471e29a7

eliminate global access to resource_manager in qterminal widget * QTerminal.h, QTerminal.cc (QTerminal::create): Accept reference to octave_qobject. Change all uses. Call construct to set up signal/slot connections and context menu after creating object. (QTerminal::construct): New function. Move body of QTerminal constructor here. * libgui/qterminal/module.mk: Use full list of CPPFLAGS for interpreter directories.

author	John W. Eaton <jwe@octave.org>
date	Wed, 06 Nov 2019 14:29:42 -0500
parents	deb8cb929ee3
children	ba4271934b1c

rev	line source
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	1 noinst_HEADERS += \
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	2 %reldir%/libqterminal/QTerminal.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	3 %reldir%/libqterminal/win32/QTerminalColors.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	4 %reldir%/libqterminal/win32/QWinTerminalImpl.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	5 %reldir%/libqterminal/unix/BlockArray.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	6 %reldir%/libqterminal/unix/Character.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	7 %reldir%/libqterminal/unix/CharacterColor.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	8 %reldir%/libqterminal/unix/Emulation.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	9 %reldir%/libqterminal/unix/ExtendedDefaultTranslator.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	10 %reldir%/libqterminal/unix/ExtendedDefaultTranslatorMac.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	11 %reldir%/libqterminal/unix/Filter.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	12 %reldir%/libqterminal/unix/History.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	13 %reldir%/libqterminal/unix/KeyboardTranslator.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	14 %reldir%/libqterminal/unix/konsole_wcwidth.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	15 %reldir%/libqterminal/unix/kpty.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	16 %reldir%/libqterminal/unix/kpty_p.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	17 %reldir%/libqterminal/unix/LineFont.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	18 %reldir%/libqterminal/unix/QUnixTerminalImpl.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	19 %reldir%/libqterminal/unix/Screen.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	20 %reldir%/libqterminal/unix/ScreenWindow.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	21 %reldir%/libqterminal/unix/TerminalCharacterDecoder.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	22 %reldir%/libqterminal/unix/Vt102Emulation.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	23 %reldir%/libqterminal/unix/SelfListener.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	24 %reldir%/libqterminal/unix/TerminalModel.h \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	25 %reldir%/libqterminal/unix/TerminalView.h
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	26
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	27 libgui_qterminal_libqterminal_la_MOC =
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	28
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	29 OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC = \
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	30 %reldir%/libqterminal/moc-QTerminal.cc
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	31
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	32 $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC): \| %reldir%/libqterminal/$(octave_dirstamp)
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	33
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	34 DIRSTAMP_FILES += \
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	35 %reldir%/libqterminal/$(octave_dirstamp)
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	36
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	37 %canon_reldir%_libqterminal_la_MOC += \
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	38 $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	39
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	40 nodist_%canon_reldir%_libqterminal_la_SOURCES = $(%canon_reldir%_libqterminal_la_MOC)
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	41
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	42 %canon_reldir%_libqterminal_la_CPPFLAGS = \
15363 482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	43 $(AM_CPPFLAGS) \
15596 5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway). Michael Goffioul <michael.goffioul@gmail.com> parents: 15392 diff changeset	44 @QT_CPPFLAGS@ \
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	45 -I$(srcdir)/libgui/qterminal/libqterminal \
27648 2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	46 -I$(srcdir)/libgui/src \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	47 -Iliboctave \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	48 -I$(srcdir)/liboctave/array \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	49 -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	50 -Iliboctave/operators -I$(srcdir)/liboctave/operators \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	51 -I$(srcdir)/liboctave/system \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	52 -I$(srcdir)/liboctave/util \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	53 -Ilibinterp -I$(srcdir)/libinterp \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	54 -Ilibinterp/parse-tree -I$(srcdir)/libinterp/parse-tree \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	55 -Ilibinterp/corefcn -I$(srcdir)/libinterp/corefcn \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	56 -I$(srcdir)/libinterp/octave-value \
2952471e29a7 eliminate global access to resource_manager in qterminal widget John W. Eaton <jwe@octave.org> parents: 25594 diff changeset	57 -I$(srcdir)/liboctave/wrappers
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	58
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	59 %canon_reldir%_libqterminal_la_CFLAGS = ${CPICFLAG} ${XTRA_CFLAGS}
15363 482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	60
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	61 %canon_reldir%_libqterminal_la_CXXFLAGS = ${CXXPICFLAG} ${XTRA_CXXFLAGS}
15363 482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	62
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	63 if WIN32_TERMINAL
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	64
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	65 %canon_reldir%_libqterminal_la_SOURCES = \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	66 %reldir%/libqterminal/win32/QTerminalColors.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	67 %reldir%/libqterminal/win32/QWinTerminalImpl.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	68 %reldir%/libqterminal/QTerminal.cc
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	69
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	70 OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC = \
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	71 %reldir%/libqterminal/win32/moc-QWinTerminalImpl.cc
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	72
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	73 %canon_reldir%_libqterminal_la_MOC += \
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	74 $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	75
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	76 $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC): \| %reldir%/libqterminal/win32/$(octave_dirstamp)
15392 c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15363 diff changeset	77
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	78 DIRSTAMP_FILES += \
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	79 %reldir%/libqterminal/win32/$(octave_dirstamp)
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	80
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	81 %canon_reldir%_libqterminal_la_CPPFLAGS += -DUNICODE
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	82
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	83 # This flag is required to let MOC know about Q_OS_WIN32.
15596 5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway). Michael Goffioul <michael.goffioul@gmail.com> parents: 15392 diff changeset	84 MOC_CPPFLAGS += -DQ_OS_WIN32
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	85
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	86 else
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	87
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	88 %canon_reldir%_libqterminal_la_SOURCES = \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	89 %reldir%/libqterminal/unix/BlockArray.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	90 %reldir%/libqterminal/unix/Emulation.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	91 %reldir%/libqterminal/unix/Filter.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	92 %reldir%/libqterminal/unix/History.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	93 %reldir%/libqterminal/unix/KeyboardTranslator.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	94 %reldir%/libqterminal/unix/konsole_wcwidth.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	95 %reldir%/libqterminal/unix/kpty.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	96 %reldir%/libqterminal/unix/QUnixTerminalImpl.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	97 %reldir%/libqterminal/unix/Screen.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	98 %reldir%/libqterminal/unix/ScreenWindow.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	99 %reldir%/libqterminal/unix/TerminalCharacterDecoder.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	100 %reldir%/libqterminal/unix/Vt102Emulation.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	101 %reldir%/libqterminal/unix/SelfListener.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	102 %reldir%/libqterminal/unix/TerminalModel.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	103 %reldir%/libqterminal/unix/TerminalView.cpp \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	104 %reldir%/libqterminal/QTerminal.cc
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	105
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	106 OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC = \
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	107 %reldir%/libqterminal/unix/moc-Emulation.cc \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	108 %reldir%/libqterminal/unix/moc-Filter.cc \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	109 %reldir%/libqterminal/unix/moc-QUnixTerminalImpl.cc \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	110 %reldir%/libqterminal/unix/moc-ScreenWindow.cc \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	111 %reldir%/libqterminal/unix/moc-SelfListener.cc \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	112 %reldir%/libqterminal/unix/moc-TerminalModel.cc \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	113 %reldir%/libqterminal/unix/moc-TerminalView.cc \
deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	114 %reldir%/libqterminal/unix/moc-Vt102Emulation.cc
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	115
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	116 %canon_reldir%_libqterminal_la_MOC += \
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	117 $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	118
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	119 $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC): \| %reldir%/libqterminal/unix/$(octave_dirstamp)
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	120
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19936 diff changeset	121 DIRSTAMP_FILES += \
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	122 %reldir%/libqterminal/unix/$(octave_dirstamp)
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	123
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	124 endif
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	125
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	126 noinst_LTLIBRARIES += %reldir%/libqterminal.la
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	127
25594 deb8cb929ee3 move libgui/qterminal-module.mk to libgui/qterminal/module.mk John W. Eaton <jwe@octave.org> parents: 25593 diff changeset	128 libgui_CLEANFILES += $(%canon_reldir%_libqterminal_la_MOC)

Mercurial > octave

annotate libgui/qterminal/module.mk @ 27648:2952471e29a7