annotate libgui/src/module.mk @ 27197:b8c0d5ad024f

refactor and rename some qt application objects * octave-qobject.h, octave-qobject.cc: New files. Move octave_qapplication, octave_qt_app, octave_qt_cli_app, and octave_qt_gui_app classes here from main-window.h and main-window.cc. Rename octave_qt_app to base_qobject. Rename octave_qt_cli_app to cli_qobject. Rename octave_qt_gui_app to gui_qobject. * qt-application.h, qt-application.cc: Rename from octave-gui.h and octave-gui.cc. Rename gui_application class to qt_application. Change all uses. * libgui/src/module.mk: Update.
author John W. Eaton <jwe@octave.org>
date Sat, 22 Jun 2019 17:30:16 -0500
parents d993642352d0
children 420611c61298
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 = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
2 %reldir%/icons/applications-system.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
3 %reldir%/icons/bottom_left_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
4 %reldir%/icons/bottom_right_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
5 %reldir%/icons/bottom_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
6 %reldir%/icons/bp-next.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
7 %reldir%/icons/bp-prev.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
8 %reldir%/icons/bp-rm-all.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
9 %reldir%/icons/bp-toggle.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
10 %reldir%/icons/circle.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
11 %reldir%/icons/cross.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
12 %reldir%/icons/db-cont.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
13 %reldir%/icons/db-step-in.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
14 %reldir%/icons/db-step-out.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
15 %reldir%/icons/db-step.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
16 %reldir%/icons/db-stop.png \
25921
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 25617
diff changeset
17 %reldir%/icons/dialog-error.png \
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 25617
diff changeset
18 %reldir%/icons/dialog-information.png \
9c47eedc44e2 msgbox.m: use graphics objects to build dialog (bug #42490)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 25617
diff changeset
19 %reldir%/icons/dialog-warning.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
20 %reldir%/icons/document-new.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
21 %reldir%/icons/document-open.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
22 %reldir%/icons/document-print.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
23 %reldir%/icons/document-save.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
24 %reldir%/icons/document-save-as.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
25 %reldir%/icons/edit-copy.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
26 %reldir%/icons/edit-cut.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
27 %reldir%/icons/edit-delete.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
28 %reldir%/icons/edit-find.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
29 %reldir%/icons/edit-find-replace.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
30 %reldir%/icons/edit-paste.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
31 %reldir%/icons/edit-redo.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
32 %reldir%/icons/edit-undo.png \
26869
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
33 %reldir%/icons/figure-axes.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
34 %reldir%/icons/figure-grid.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
35 %reldir%/icons/figure-pan.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
36 %reldir%/icons/figure-rotate.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
37 %reldir%/icons/figure-text.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
38 %reldir%/icons/figure-zoom-in.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
39 %reldir%/icons/figure-zoom-original.png \
992f55ef87f5 Use an uitoolbar and ui*tools to build the default figure toolbar (bug #55795)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26309
diff changeset
40 %reldir%/icons/figure-zoom-out.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
41 %reldir%/icons/fleur.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
42 %reldir%/icons/folder.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
43 %reldir%/icons/folder-new.png \
25244
f9fe8cf64e09 Add go-down icon to GUI icon set (bug #53639).
Rik <rik@octave.org>
parents: 25042
diff changeset
44 %reldir%/icons/go-down.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
45 %reldir%/icons/go-first.png \
26139
198902f24ef6 add missing icon files for doc browser history toolbar (bug #54938)
Torsten <mttl@mailbox.org>
parents: 26017
diff changeset
46 %reldir%/icons/go-home.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
47 %reldir%/icons/go-last.png \
26139
198902f24ef6 add missing icon files for doc browser history toolbar (bug #54938)
Torsten <mttl@mailbox.org>
parents: 26017
diff changeset
48 %reldir%/icons/go-next.png \
198902f24ef6 add missing icon files for doc browser history toolbar (bug #54938)
Torsten <mttl@mailbox.org>
parents: 26017
diff changeset
49 %reldir%/icons/go-previous.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
50 %reldir%/icons/go-up.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
51 %reldir%/icons/graphic_logo_DocumentationDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
52 %reldir%/icons/graphic_logo_FileEditor.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
53 %reldir%/icons/graphic_logo_FilesDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
54 %reldir%/icons/graphic_logo_HistoryDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
55 %reldir%/icons/graphic_logo_NewsDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
56 %reldir%/icons/graphic_logo_TerminalDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
57 %reldir%/icons/graphic_logo_WorkspaceView.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
58 %reldir%/icons/graphic_logo_ReleaseWidget.png \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
59 %reldir%/icons/graphic_logo_VariableEditor.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
60 %reldir%/icons/graphic_logo_DocumentationDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
61 %reldir%/icons/graphic_logo_FileEditor.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
62 %reldir%/icons/graphic_logo_FilesDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
63 %reldir%/icons/graphic_logo_HistoryDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
64 %reldir%/icons/graphic_logo_NewsDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
65 %reldir%/icons/graphic_logo_TerminalDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
66 %reldir%/icons/graphic_logo_WorkspaceView.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
67 %reldir%/icons/graphic_logo_ReleaseWidget.svg \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
68 %reldir%/icons/graphic_logo_VariableEditor.svg \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
69 %reldir%/icons/hand2.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
70 %reldir%/icons/icons_license \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
71 %reldir%/icons/left_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
72 %reldir%/icons/letter_logo_DocumentationDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
73 %reldir%/icons/letter_logo_FileEditor.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
74 %reldir%/icons/letter_logo_FilesDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
75 %reldir%/icons/letter_logo_HistoryDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
76 %reldir%/icons/letter_logo_NewsDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
77 %reldir%/icons/letter_logo_TerminalDockWidget.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
78 %reldir%/icons/letter_logo_WorkspaceView.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
79 %reldir%/icons/letter_logo_ReleaseWidget.png \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
80 %reldir%/icons/letter_logo_VariableEditor.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
81 %reldir%/icons/letter_logo_DocumentationDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
82 %reldir%/icons/letter_logo_FileEditor.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
83 %reldir%/icons/letter_logo_FilesDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
84 %reldir%/icons/letter_logo_HistoryDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
85 %reldir%/icons/letter_logo_NewsDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
86 %reldir%/icons/letter_logo_TerminalDockWidget.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
87 %reldir%/icons/letter_logo_WorkspaceView.svg \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
88 %reldir%/icons/letter_logo_ReleaseWidget.svg \
24830
5bcda4f98997 Create an icon for the variable editor (bug #53260)
Daniel J Sebald <daniel.sebald@ieee.org>
parents: 24679
diff changeset
89 %reldir%/icons/letter_logo_VariableEditor.svg \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
90 %reldir%/icons/logo.png \
24135
bdd4a8476c39 new icon for the plot menu in the variable editor
Alexander Wilms <alexanderw>, Torsten <mttl@mailbox.org>
parents: 24061
diff changeset
91 %reldir%/icons/plot-xy-curve.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
92 %reldir%/icons/preferences-system.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
93 %reldir%/icons/right_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
94 %reldir%/icons/system-run.png \
27099
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
95 %reldir%/icons/top_left_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
96 %reldir%/icons/top_right_corner.png \
2cd31365c84a Implement "pointer" and related figure properties for Qt toolkit (bug #56347)
Pantxo Diribarne <pantxo.diribarne@gmail.com>
parents: 26869
diff changeset
97 %reldir%/icons/top_side.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
98 %reldir%/icons/user-home.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
99 %reldir%/icons/view-refresh.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
100 %reldir%/icons/widget-close.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
101 %reldir%/icons/widget-dock.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
102 %reldir%/icons/widget-undock.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
103 %reldir%/icons/widget-close-light.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
104 %reldir%/icons/widget-dock-light.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
105 %reldir%/icons/widget-undock-light.png \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
106 %reldir%/icons/zoom-in.png \
26017
390d59717711 adding a toolbar with common browse tools to the doc browser (bug 54938)
Torsten <mttl@mailbox.org>
parents: 25931
diff changeset
107 %reldir%/icons/zoom-original.png \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
108 %reldir%/icons/zoom-out.png
15362
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
109
16291
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
110 octave_gui_MOC =
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
111
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
112 if AMCOND_HAVE_QSCINTILLA
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
113
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
114 OCTAVE_GUI_SRC_M_EDITOR_MOC = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
115 %reldir%/m-editor/moc-file-editor-interface.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
116 %reldir%/m-editor/moc-file-editor-tab.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
117 %reldir%/m-editor/moc-file-editor.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
118 %reldir%/m-editor/moc-find-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
119 %reldir%/m-editor/moc-octave-qscintilla.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
120 %reldir%/m-editor/moc-octave-txt-lexer.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
121 %reldir%/m-editor/moc-marker.cc
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
122
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
123 $(OCTAVE_GUI_SRC_M_EDITOR_MOC): | %reldir%/m-editor/$(octave_dirstamp)
16291
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
124
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available.
Rik <rik@octave.org>
parents: 16057
diff changeset
125 octave_gui_MOC += \
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
126 $(OCTAVE_GUI_SRC_M_EDITOR_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
127
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
128 DIRSTAMP_FILES += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
129 %reldir%/m-editor/$(octave_dirstamp)
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
130
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
131 endif
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
132
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
133 OCTAVE_GUI_SRC_MOC = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
134 %reldir%/moc-external-editor-interface.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
135 %reldir%/moc-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
136 %reldir%/moc-documentation-dock-widget.cc \
25042
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006)
Torsten <mttl@mailbox.org>
parents: 24830
diff changeset
137 %reldir%/moc-documentation.cc \
25398
a78e5b8d5ee7 provide shortcuts for closing widgets of the variable editor (bug #53002)
Torsten <mttl@mailbox.org>
parents: 25397
diff changeset
138 %reldir%/moc-dw-main-window.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
139 %reldir%/moc-files-dock-widget.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
140 %reldir%/moc-history-dock-widget.cc \
27196
d993642352d0 rename octave_interpreter object in GUI
John W. Eaton <jwe@octave.org>
parents: 27193
diff changeset
141 %reldir%/moc-interpreter-qobject.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
142 %reldir%/moc-main-window.cc \
27193
01e73e1664ff move news reader widget to separate file
John W. Eaton <jwe@octave.org>
parents: 27099
diff changeset
143 %reldir%/moc-news-reader.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
144 %reldir%/moc-octave-cmd.cc \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
145 %reldir%/moc-octave-qobject.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
146 %reldir%/moc-octave-qt-link.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
147 %reldir%/moc-settings-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
148 %reldir%/moc-terminal-dock-widget.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
149 %reldir%/moc-color-picker.cc \
24679
a3e67a9e7be5 move derived tab bar from editor and doc viewer into separate file
Torsten <mttl@mailbox.org>
parents: 24475
diff changeset
150 %reldir%/moc-tab-bar.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
151 %reldir%/moc-resource-manager.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
152 %reldir%/moc-shortcut-manager.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
153 %reldir%/moc-welcome-wizard.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
154 %reldir%/moc-workspace-model.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
155 %reldir%/moc-workspace-view.cc \
23927
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
156 %reldir%/moc-variable-editor.cc \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
157 %reldir%/moc-variable-editor-model.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
158 %reldir%/moc-find-files-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
159 %reldir%/moc-find-files-model.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
160 %reldir%/moc-octave-dock-widget.cc
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
161
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
162 octave_gui_MOC += \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
163 $(OCTAVE_GUI_SRC_MOC) \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
164 $(OCTAVE_GUI_EDITOR_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
165
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
166 octave_gui_RC = %reldir%/qrc-resource.cc
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
167
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
168 $(octave_gui_RC): | %reldir%/$(octave_dirstamp)
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
169
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
170 DIRSTAMP_FILES += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
171 %reldir%/$(octave_dirstamp)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
172
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
173 octave_gui_UI = \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
174 %reldir%/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
175
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
176 octave_gui_UI_H = $(patsubst %reldir%/%.ui, %reldir%/ui-%.h, $(octave_gui_UI))
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
177
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
178 $(octave_gui_UI_H): | %reldir%/$(octave_dirstamp)
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
179
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
180 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
181
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
182 noinst_HEADERS += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
183 %reldir%/dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
184 %reldir%/octave-dock-widget.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
185 %reldir%/documentation-dock-widget.h \
25042
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006)
Torsten <mttl@mailbox.org>
parents: 24830
diff changeset
186 %reldir%/documentation.h \
25398
a78e5b8d5ee7 provide shortcuts for closing widgets of the variable editor (bug #53002)
Torsten <mttl@mailbox.org>
parents: 25397
diff changeset
187 %reldir%/dw-main-window.h \
25617
44d638d5eea5 reorganize constants for preferences keys and default values
Torsten <mttl@mailbox.org>
parents: 25614
diff changeset
188 %reldir%/gui-preferences.h \
26309
b26b31781b30 separate include file for main window gui preferences
Torsten <mttl@mailbox.org>
parents: 26139
diff changeset
189 %reldir%/gui-preferences-mw.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
190 %reldir%/external-editor-interface.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
191 %reldir%/files-dock-widget.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
192 %reldir%/history-dock-widget.h \
27196
d993642352d0 rename octave_interpreter object in GUI
John W. Eaton <jwe@octave.org>
parents: 27193
diff changeset
193 %reldir%/interpreter-qobject.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
194 %reldir%/m-editor/file-editor-interface.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
195 %reldir%/m-editor/file-editor-tab.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
196 %reldir%/m-editor/file-editor.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
197 %reldir%/m-editor/find-dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
198 %reldir%/m-editor/octave-qscintilla.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
199 %reldir%/m-editor/octave-txt-lexer.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
200 %reldir%/m-editor/marker.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
201 %reldir%/main-window.h \
27193
01e73e1664ff move news reader widget to separate file
John W. Eaton <jwe@octave.org>
parents: 27099
diff changeset
202 %reldir%/news-reader.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
203 %reldir%/octave-cmd.h \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
204 %reldir%/octave-qobject.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
205 %reldir%/octave-qt-link.h \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
206 %reldir%/qt-application.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
207 %reldir%/resource-manager.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
208 %reldir%/settings-dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
209 %reldir%/shortcut-manager.h \
24679
a3e67a9e7be5 move derived tab bar from editor and doc viewer into separate file
Torsten <mttl@mailbox.org>
parents: 24475
diff changeset
210 %reldir%/tab-bar.h \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
211 %reldir%/terminal-dock-widget.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
212 %reldir%/color-picker.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
213 %reldir%/welcome-wizard.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
214 %reldir%/find-files-dialog.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
215 %reldir%/find-files-model.h \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
216 %reldir%/workspace-model.h \
23927
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
217 %reldir%/workspace-view.h \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
218 %reldir%/variable-editor.h \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
219 %reldir%/variable-editor-model.h
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
220
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
221 %canon_reldir%_%canon_reldir%_la_SOURCES = \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
222 %reldir%/dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
223 %reldir%/documentation-dock-widget.cc \
25042
ba5af45bbfc4 documentation widget based on qt help engine (bug #53006)
Torsten <mttl@mailbox.org>
parents: 24830
diff changeset
224 %reldir%/documentation.cc \
25398
a78e5b8d5ee7 provide shortcuts for closing widgets of the variable editor (bug #53002)
Torsten <mttl@mailbox.org>
parents: 25397
diff changeset
225 %reldir%/dw-main-window.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
226 %reldir%/external-editor-interface.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
227 %reldir%/files-dock-widget.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
228 %reldir%/history-dock-widget.cc \
27196
d993642352d0 rename octave_interpreter object in GUI
John W. Eaton <jwe@octave.org>
parents: 27193
diff changeset
229 %reldir%/interpreter-qobject.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
230 %reldir%/m-editor/file-editor-tab.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
231 %reldir%/m-editor/file-editor.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
232 %reldir%/m-editor/find-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
233 %reldir%/m-editor/octave-qscintilla.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
234 %reldir%/m-editor/octave-txt-lexer.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
235 %reldir%/m-editor/marker.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
236 %reldir%/main-window.cc \
27193
01e73e1664ff move news reader widget to separate file
John W. Eaton <jwe@octave.org>
parents: 27099
diff changeset
237 %reldir%/news-reader.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
238 %reldir%/octave-cmd.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
239 %reldir%/octave-dock-widget.cc \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
240 %reldir%/octave-qobject.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
241 %reldir%/octave-qt-link.cc \
27197
b8c0d5ad024f refactor and rename some qt application objects
John W. Eaton <jwe@octave.org>
parents: 27196
diff changeset
242 %reldir%/qt-application.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
243 %reldir%/resource-manager.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
244 %reldir%/settings-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
245 %reldir%/shortcut-manager.cc \
24679
a3e67a9e7be5 move derived tab bar from editor and doc viewer into separate file
Torsten <mttl@mailbox.org>
parents: 24475
diff changeset
246 %reldir%/tab-bar.cc \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
247 %reldir%/terminal-dock-widget.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
248 %reldir%/color-picker.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
249 %reldir%/welcome-wizard.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
250 %reldir%/find-files-dialog.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
251 %reldir%/find-files-model.cc \
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
252 %reldir%/workspace-model.cc \
23927
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
253 %reldir%/workspace-view.cc \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
254 %reldir%/variable-editor.cc \
e3a36f84d01d provide variable-editor widget for the GUI
Michael Barnes <mjbcode@runbox.com>
parents: 23495
diff changeset
255 %reldir%/variable-editor-model.cc
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
256
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
257 nodist_%canon_reldir%_%canon_reldir%_la_SOURCES = \
21608
80258bb3a14b store hg id info in libgui and main exe and check for consistency (bug #45659)
John W. Eaton <jwe@octave.org>
parents: 21290
diff changeset
258 $(octave_gui_MOC) \
80258bb3a14b store hg id info in libgui and main exe and check for consistency (bug #45659)
John W. Eaton <jwe@octave.org>
parents: 21290
diff changeset
259 $(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
260
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
261 %canon_reldir%_%canon_reldir%_la_CPPFLAGS = \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
262 $(AM_CPPFLAGS) \
19277
18a3eaf7bdf0 make --with-PKG-includedir and --with-PKG-libdir configure options work again
John W. Eaton <jwe@octave.org>
parents: 18611
diff changeset
263 $(FT2_CPPFLAGS) \
18498
2e7cad6f180c Initial integration of QtHandles.
John W. Eaton <jwe@octave.org>
parents: 18269
diff changeset
264 $(FONTCONFIG_CPPFLAGS) \
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
265 @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
266 @QT_CPPFLAGS@ \
20326
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
267 -I$(srcdir)/libgui/qterminal/libqterminal \
8ef616eec739 eliminate recursive make invocation in libgui directory tree
John W. Eaton <jwe@octave.org>
parents: 19900
diff changeset
268 -Ilibgui/src -I$(srcdir)/libgui/src \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
269 -I$(srcdir)/%reldir%/m-editor \
25397
2cf750f5cb7d make version info accessible in liboctave
John W. Eaton <jwe@octave.org>
parents: 25275
diff changeset
270 -Iliboctave \
21290
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
271 -I$(srcdir)/liboctave/array \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
272 -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
273 -Iliboctave/operators -I$(srcdir)/liboctave/operators \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
274 -I$(srcdir)/liboctave/system \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
275 -I$(srcdir)/liboctave/util \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
276 -Ilibinterp -I$(srcdir)/libinterp \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
277 -Ilibinterp/parse-tree -I$(srcdir)/libinterp/parse-tree \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
278 -Ilibinterp/corefcn -I$(srcdir)/libinterp/corefcn \
1309edb344e1 use top_srcdir, top_builddir, abs_top_srcdir or abs_top_builddir only if needed
John W. Eaton <jwe@octave.org>
parents: 21028
diff changeset
279 -I$(srcdir)/libinterp/octave-value \
21941
1d23b75cbcd1 hide signal.h from C++ sources
John W. Eaton <jwe@octave.org>
parents: 21608
diff changeset
280 -I$(srcdir)/liboctave/wrappers
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15362
diff changeset
281
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
282 noinst_LTLIBRARIES += %reldir%/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
283
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
284 libgui_EXTRA_DIST += \
23495
8308417aff1c use automake %reldir% feature
John W. Eaton <jwe@octave.org>
parents: 23427
diff changeset
285 %reldir%/resource.qrc \
20366
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
286 $(octave_gui_UI) \
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
287 $(octave_gui_ICONS)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
288
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20326
diff changeset
289 libgui_CLEANFILES += \
15392
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
290 $(octave_gui_MOC) \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents: 15391
diff changeset
291 $(octave_gui_UI_H) \
23427
48fd5980e29a Refactor and normalize generated build info source files
Mike Miller <mtmiller@octave.org>
parents: 23426
diff changeset
292 $(octave_gui_RC)