Mercurial > hg > octave-jordi

annotate libgui/src/module.mk @ 21027:4a7d9c335402

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GUI: move the command queue into a separate class * main-window.cc (main_window): remove initializations of queue synchronization; (execute_command_in_terminal,run_file_callback,debug_continue,debug_step_into, debug_step_over,debug_step_out,debug_quit,closeEvent): adapt queuing commands; (queue_command): remove function for queuing a command; (execute_command_callback): move function from here into octave-cmd; * main-window.h: remove class variables related to the command queue_command * module.mk: add octave-cmd to the moc-list * octave-cmd.cc: new class octave_command_queue; (add_cmd): method for adding a command to the queue; (execute_command_callback): method for executing commands from the queue * octave-cmd.h: new class octave_command_queue
author Torsten <ttl@justmail.de>
date Sun, 03 Jan 2016 11:49:19 +0100
parents 0a09c3cae800
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15362
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 octave_gui_ICONS = \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
2 libgui/src/icons/applications-system.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
3 libgui/src/icons/bp-next.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
4 libgui/src/icons/bp-prev.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
5 libgui/src/icons/bp-rm-all.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
6 libgui/src/icons/bp-toggle.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
7 libgui/src/icons/db-cont.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
8 libgui/src/icons/db-step-in.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
9 libgui/src/icons/db-step-out.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
10 libgui/src/icons/db-step.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
11 libgui/src/icons/db-stop.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
12 libgui/src/icons/document-new.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
13 libgui/src/icons/document-open.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
14 libgui/src/icons/document-print.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
15 libgui/src/icons/document-save.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
16 libgui/src/icons/document-save-as.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
17 libgui/src/icons/edit-copy.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
18 libgui/src/icons/edit-cut.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
19 libgui/src/icons/edit-delete.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
20 libgui/src/icons/edit-find.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
21 libgui/src/icons/edit-find-replace.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
22 libgui/src/icons/edit-paste.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
23 libgui/src/icons/edit-redo.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
24 libgui/src/icons/edit-undo.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
25 libgui/src/icons/folder.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
26 libgui/src/icons/folder-new.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
27 libgui/src/icons/go-first.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
28 libgui/src/icons/go-last.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
29 libgui/src/icons/go-up.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
30 libgui/src/icons/graphic_logo_DocumentationDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
31 libgui/src/icons/graphic_logo_FileEditor.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
32 libgui/src/icons/graphic_logo_FilesDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
33 libgui/src/icons/graphic_logo_HistoryDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
34 libgui/src/icons/graphic_logo_NewsDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
35 libgui/src/icons/graphic_logo_TerminalDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
36 libgui/src/icons/graphic_logo_WorkspaceView.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
37 libgui/src/icons/graphic_logo_ReleaseWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
38 libgui/src/icons/icons_license \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
39 libgui/src/icons/letter_logo_DocumentationDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
40 libgui/src/icons/letter_logo_FileEditor.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
41 libgui/src/icons/letter_logo_FilesDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
42 libgui/src/icons/letter_logo_HistoryDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
43 libgui/src/icons/letter_logo_NewsDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
44 libgui/src/icons/letter_logo_TerminalDockWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
45 libgui/src/icons/letter_logo_WorkspaceView.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
46 libgui/src/icons/letter_logo_ReleaseWidget.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
47 libgui/src/icons/logo.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
48 libgui/src/icons/preferences-system.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
49 libgui/src/icons/system-run.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
50 libgui/src/icons/user-home.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
51 libgui/src/icons/view-refresh.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
52 libgui/src/icons/widget-close.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
53 libgui/src/icons/widget-dock.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
54 libgui/src/icons/widget-undock.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
55 libgui/src/icons/widget-close-light.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
56 libgui/src/icons/widget-dock-light.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
57 libgui/src/icons/widget-undock-light.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
58 libgui/src/icons/zoom-in.png \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
59 libgui/src/icons/zoom-out.png
15362
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60
16291
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
61 octave_gui_MOC =
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
62
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
63 if AMCOND_HAVE_QSCINTILLA
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
64
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
65 OCTAVE_GUI_SRC_M_EDITOR_MOC = \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
66 libgui/src/m-editor/moc-file-editor-interface.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
67 libgui/src/m-editor/moc-file-editor-tab.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
68 libgui/src/m-editor/moc-file-editor.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
69 libgui/src/m-editor/moc-find-dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
70 libgui/src/m-editor/moc-octave-qscintilla.cc \
21006
0a09c3cae800 New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 20366
diff changeset
71 libgui/src/m-editor/moc-octave-txt-lexer.cc \
0a09c3cae800 New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 20366
diff changeset
72 libgui/src/m-editor/moc-marker.cc
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
73
20366
6b7c10920dfe make interpreter targets and dirstamp files order-only prerequisites
John W. Eaton <jwe@octave.org>
parents: 20365
diff changeset
74 $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | libgui/src/m-editor/$(octave_dirstamp)
16291
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
75
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
76 octave_gui_MOC += \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
77 $(OCTAVE_GUI_SRC_M_EDITOR_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
78
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
79 DIRSTAMP_FILES += \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
80 libgui/src/m-editor/$(octave_dirstamp)
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
81
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
82 endif
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
83
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
84 OCTAVE_GUI_SRC_MOC = \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
85 libgui/src/moc-dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
86 libgui/src/moc-documentation-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
87 libgui/src/moc-files-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
88 libgui/src/moc-history-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
89 libgui/src/moc-main-window.cc \
21027
4a7d9c335402 GUI: move the command queue into a separate class
Torsten <ttl@justmail.de>
parents: 21006
diff changeset
90 libgui/src/moc-octave-cmd.cc \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
91 libgui/src/moc-octave-interpreter.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
92 libgui/src/moc-octave-qt-link.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
93 libgui/src/moc-settings-dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
94 libgui/src/moc-terminal-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
95 libgui/src/moc-color-picker.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
96 libgui/src/moc-resource-manager.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
97 libgui/src/moc-shortcut-manager.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
98 libgui/src/moc-welcome-wizard.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
99 libgui/src/moc-workspace-model.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
100 libgui/src/moc-workspace-view.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
101 libgui/src/moc-find-files-dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
102 libgui/src/moc-find-files-model.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
103 libgui/src/qtinfo/moc-parser.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
104 libgui/src/qtinfo/moc-webinfo.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
105 libgui/src/moc-octave-dock-widget.cc
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
106
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
107 octave_gui_MOC += \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
108 $(OCTAVE_GUI_SRC_MOC) \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
109 $(OCTAVE_GUI_EDITOR_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
110
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
111 octave_gui_RC = libgui/src/qrc-resource.cc
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
112
20366
6b7c10920dfe make interpreter targets and dirstamp files order-only prerequisites
John W. Eaton <jwe@octave.org>
parents: 20365
diff changeset
113 $(octave_gui_RC): | libgui/src/$(octave_dirstamp)
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
114
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
115 DIRSTAMP_FILES += \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
116 libgui/src/$(octave_dirstamp)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
117
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
118 octave_gui_UI = \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
119 libgui/src/settings-dialog.ui
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
120
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
121 octave_gui_UI_H = $(patsubst libgui/src/%.ui, libgui/src/ui-%.h, $(octave_gui_UI))
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
122
20366
6b7c10920dfe make interpreter targets and dirstamp files order-only prerequisites
John W. Eaton <jwe@octave.org>
parents: 20365
diff changeset
123 $(octave_gui_UI_H): | libgui/src/$(octave_dirstamp)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
124
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
125 BUILT_SOURCES += $(octave_gui_UI_H)
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
126
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
127 noinst_HEADERS += \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
128 libgui/src/dialog.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
129 libgui/src/octave-dock-widget.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
130 libgui/src/documentation-dock-widget.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
131 libgui/src/files-dock-widget.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
132 libgui/src/history-dock-widget.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
133 libgui/src/m-editor/file-editor-interface.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
134 libgui/src/m-editor/file-editor-tab.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
135 libgui/src/m-editor/file-editor.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
136 libgui/src/m-editor/find-dialog.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
137 libgui/src/m-editor/octave-qscintilla.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
138 libgui/src/m-editor/octave-txt-lexer.h \
21006
0a09c3cae800 New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 20366
diff changeset
139 libgui/src/m-editor/marker.h \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
140 libgui/src/main-window.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
141 libgui/src/octave-gui.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
142 libgui/src/octave-cmd.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
143 libgui/src/octave-interpreter.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
144 libgui/src/octave-qt-link.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
145 libgui/src/qtinfo/parser.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
146 libgui/src/qtinfo/webinfo.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
147 libgui/src/resource-manager.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
148 libgui/src/settings-dialog.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
149 libgui/src/shortcut-manager.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
150 libgui/src/thread-manager.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
151 libgui/src/terminal-dock-widget.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
152 libgui/src/color-picker.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
153 libgui/src/welcome-wizard.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
154 libgui/src/find-files-dialog.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
155 libgui/src/find-files-model.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
156 libgui/src/workspace-model.h \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
157 libgui/src/workspace-view.h
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
158
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
159 libgui_src_libgui_src_la_SOURCES = \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
160 libgui/src/dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
161 libgui/src/documentation-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
162 libgui/src/files-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
163 libgui/src/history-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
164 libgui/src/m-editor/file-editor-tab.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
165 libgui/src/m-editor/file-editor.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
166 libgui/src/m-editor/find-dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
167 libgui/src/m-editor/octave-qscintilla.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
168 libgui/src/m-editor/octave-txt-lexer.cc \
21006
0a09c3cae800 New marker class for modified file breakpoint and position maintenance.
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 20366
diff changeset
169 libgui/src/m-editor/marker.cc \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
170 libgui/src/main-window.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
171 libgui/src/octave-cmd.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
172 libgui/src/octave-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
173 libgui/src/octave-gui.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
174 libgui/src/octave-interpreter.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
175 libgui/src/octave-qt-link.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
176 libgui/src/qtinfo/parser.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
177 libgui/src/qtinfo/webinfo.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
178 libgui/src/resource-manager.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
179 libgui/src/settings-dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
180 libgui/src/shortcut-manager.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
181 libgui/src/thread-manager.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
182 libgui/src/terminal-dock-widget.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
183 libgui/src/color-picker.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
184 libgui/src/welcome-wizard.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
185 libgui/src/find-files-dialog.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
186 libgui/src/find-files-model.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
187 libgui/src/workspace-model.cc \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
188 libgui/src/workspace-view.cc
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
189
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
190 nodist_libgui_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
191
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
192 libgui_src_libgui_src_la_CPPFLAGS = \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
193 $(AM_CPPFLAGS) \
19276
18a3eaf7bdf0 make --with-PKG-includedir and --with-PKG-libdir configure options work again
John W. Eaton <jwe@octave.org>
parents: 18610
diff changeset
194 $(FT2_CPPFLAGS) \
18497
2e7cad6f180c Initial integration of QtHandles.
John W. Eaton <jwe@octave.org>
parents: 18268
diff changeset
195 $(FONTCONFIG_CPPFLAGS) \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
196 @OCTGUI_DLL_DEFS@ \
15596
5f031158c693 Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15404
diff changeset
197 @QT_CPPFLAGS@ \
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
198 -I$(srcdir)/libgui/qterminal/libqterminal \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
199 -Ilibgui/src -I$(srcdir)/libgui/src \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
200 -I$(srcdir)/libgui/src/m-editor \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
201 -I$(srcdir)/libgui/src/qtinfo \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
202 -I$(srcdir)/libgui/graphics \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
203 -I$(top_srcdir)/liboctave/cruft/misc \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
204 -I$(top_srcdir)/liboctave/array \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
205 -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
206 -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
207 -I$(top_srcdir)/liboctave/system \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
208 -I$(top_srcdir)/liboctave/util \
15404
f52a62a6db3a eliminate copy and paste copyright info in GUI about info box
John W. Eaton <jwe@octave.org>
parents: 15402
diff changeset
209 -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
210 -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \
16892
68fc671a9339 maint: Collapse interpfcn and interpfcn-core directories into corefcn directory.
Rik <rik@octave.org>
parents: 16820
diff changeset
211 -I$(top_builddir)/libinterp/corefcn -I$(top_srcdir)/libinterp/corefcn \
17921
2a4acd6548c6 include config.h in more files in libgui
John W. Eaton <jwe@octave.org>
parents: 17919
diff changeset
212 -I$(top_srcdir)/libinterp/octave-value \
17980
824c05a6d3ec avoid errors for int64 ops implemented with long double (bug #40607)
John W. Eaton <jwe@octave.org>
parents: 17974
diff changeset
213 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
214
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
215 libgui_src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
216
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
217 libgui_src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
218
20325
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19899
diff changeset
219 noinst_LTLIBRARIES += libgui/src/libgui-src.la
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
220
20365
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20325
diff changeset
221 libgui_EXTRA_DIST += \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20325
diff changeset
222 libgui/src/resource.qrc \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20325
diff changeset
223 $(octave_gui_UI) \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20325
diff changeset
224 $(octave_gui_ICONS)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20325
diff changeset
225
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20325
diff changeset
226 libgui_CLEANFILES += \
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
227 $(octave_gui_MOC) \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
228 $(octave_gui_UI_H) \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
229 $(octave_gui_RC)
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
230