octave: libgui/src/module.mk annotate

annotate libgui/src/module.mk @ 24475:8cb985e362f3

Allow uncommenting with any kind of comment (bug #52695): * file-editor-tab.cc (do_comment_selected_text): get list of possible strings for uncommenting and create an according regular expression; (handle_char_added): comment string is snow a string list * octave-qscintilla.cc (comment_string), octave-qscintilla.h: boolean parameter for commenting or uncommenting string, now returns a string list * module.mk: new file octave-settings.h * octave-settings.h: new files with constants for the preferences used for the comment strings * settings-dialog.cc (settings_dialog): add the required radio buttons for the comment strings programmatically, read preferences from settings file; (write_changed_settings): read values from radio buttons and write into the settings file * settings-dialog.h: declare the required radio butons * settings-dialog.ui: add horizontal layouts for the radio buttons

author	Torsten <mttl@mailbox.org>
date	Wed, 27 Dec 2017 20:46:11 +0100
parents	bdd4a8476c39
children	a3e67a9e7be5

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 \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	3 %reldir%/icons/bp-next.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	4 %reldir%/icons/bp-prev.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	5 %reldir%/icons/bp-rm-all.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	6 %reldir%/icons/bp-toggle.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	7 %reldir%/icons/db-cont.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	8 %reldir%/icons/db-step-in.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	9 %reldir%/icons/db-step-out.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	10 %reldir%/icons/db-step.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	11 %reldir%/icons/db-stop.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	12 %reldir%/icons/document-new.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	13 %reldir%/icons/document-open.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	14 %reldir%/icons/document-print.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	15 %reldir%/icons/document-save.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	16 %reldir%/icons/document-save-as.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	17 %reldir%/icons/edit-copy.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	18 %reldir%/icons/edit-cut.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	19 %reldir%/icons/edit-delete.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	20 %reldir%/icons/edit-find.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	21 %reldir%/icons/edit-find-replace.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	22 %reldir%/icons/edit-paste.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	23 %reldir%/icons/edit-redo.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	24 %reldir%/icons/edit-undo.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	25 %reldir%/icons/folder.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	26 %reldir%/icons/folder-new.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	27 %reldir%/icons/go-first.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	28 %reldir%/icons/go-last.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	29 %reldir%/icons/go-up.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	30 %reldir%/icons/graphic_logo_DocumentationDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	31 %reldir%/icons/graphic_logo_FileEditor.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	32 %reldir%/icons/graphic_logo_FilesDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	33 %reldir%/icons/graphic_logo_HistoryDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	34 %reldir%/icons/graphic_logo_NewsDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	35 %reldir%/icons/graphic_logo_TerminalDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	36 %reldir%/icons/graphic_logo_WorkspaceView.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	37 %reldir%/icons/graphic_logo_ReleaseWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	38 %reldir%/icons/graphic_logo_DocumentationDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	39 %reldir%/icons/graphic_logo_FileEditor.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	40 %reldir%/icons/graphic_logo_FilesDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	41 %reldir%/icons/graphic_logo_HistoryDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	42 %reldir%/icons/graphic_logo_NewsDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	43 %reldir%/icons/graphic_logo_TerminalDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	44 %reldir%/icons/graphic_logo_WorkspaceView.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	45 %reldir%/icons/graphic_logo_ReleaseWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	46 %reldir%/icons/icons_license \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	47 %reldir%/icons/letter_logo_DocumentationDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	48 %reldir%/icons/letter_logo_FileEditor.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	49 %reldir%/icons/letter_logo_FilesDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	50 %reldir%/icons/letter_logo_HistoryDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	51 %reldir%/icons/letter_logo_NewsDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	52 %reldir%/icons/letter_logo_TerminalDockWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	53 %reldir%/icons/letter_logo_WorkspaceView.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	54 %reldir%/icons/letter_logo_ReleaseWidget.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	55 %reldir%/icons/letter_logo_DocumentationDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	56 %reldir%/icons/letter_logo_FileEditor.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	57 %reldir%/icons/letter_logo_FilesDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	58 %reldir%/icons/letter_logo_HistoryDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	59 %reldir%/icons/letter_logo_NewsDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	60 %reldir%/icons/letter_logo_TerminalDockWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	61 %reldir%/icons/letter_logo_WorkspaceView.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	62 %reldir%/icons/letter_logo_ReleaseWidget.svg \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	63 %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	64 %reldir%/icons/plot-xy-curve.png \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	65 %reldir%/icons/preferences-system.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	66 %reldir%/icons/system-run.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	67 %reldir%/icons/user-home.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	68 %reldir%/icons/view-refresh.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	69 %reldir%/icons/widget-close.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	70 %reldir%/icons/widget-dock.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	71 %reldir%/icons/widget-undock.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	72 %reldir%/icons/widget-close-light.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	73 %reldir%/icons/widget-dock-light.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	74 %reldir%/icons/widget-undock-light.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	75 %reldir%/icons/zoom-in.png \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	76 %reldir%/icons/zoom-out.png
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	77
16291 c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available. Rik <rik@octave.org> parents: 16057 diff changeset	78 octave_gui_MOC =
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available. Rik <rik@octave.org> parents: 16057 diff changeset	79
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available. Rik <rik@octave.org> parents: 16057 diff changeset	80 if AMCOND_HAVE_QSCINTILLA
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	81
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	82 OCTAVE_GUI_SRC_M_EDITOR_MOC = \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	83 %reldir%/m-editor/moc-file-editor-interface.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	84 %reldir%/m-editor/moc-file-editor-tab.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	85 %reldir%/m-editor/moc-file-editor.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	86 %reldir%/m-editor/moc-find-dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	87 %reldir%/m-editor/moc-octave-qscintilla.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	88 %reldir%/m-editor/moc-octave-txt-lexer.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	89 %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	90
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	91 $(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	92
c22a6cecaedd build: Use AMCOND to build GUI editor if Qscintilla available. Rik <rik@octave.org> parents: 16057 diff changeset	93 octave_gui_MOC += \
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	94 $(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	95
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	96 DIRSTAMP_FILES += \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	97 %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	98
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	99 endif
15392 c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	100
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	101 OCTAVE_GUI_SRC_MOC = \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	102 %reldir%/moc-external-editor-interface.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	103 %reldir%/moc-dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	104 %reldir%/moc-documentation-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	105 %reldir%/moc-files-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	106 %reldir%/moc-history-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	107 %reldir%/moc-main-window.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	108 %reldir%/moc-octave-cmd.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	109 %reldir%/moc-octave-qt-link.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	110 %reldir%/moc-settings-dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	111 %reldir%/moc-terminal-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	112 %reldir%/moc-color-picker.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	113 %reldir%/moc-resource-manager.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	114 %reldir%/moc-shortcut-manager.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	115 %reldir%/moc-welcome-wizard.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	116 %reldir%/moc-workspace-model.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	117 %reldir%/moc-workspace-view.cc \
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	118 %reldir%/moc-variable-editor.cc \
e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	119 %reldir%/moc-variable-editor-model.cc \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	120 %reldir%/moc-find-files-dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	121 %reldir%/moc-find-files-model.cc \
24061 a1801e80bb11 Rename libgui `parser` class to `texinfo_parser` for clarity. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23927 diff changeset	122 %reldir%/qtinfo/moc-texinfo-parser.cc \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	123 %reldir%/qtinfo/moc-webinfo.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	124 %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	125
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	126 octave_gui_MOC += \
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	127 $(OCTAVE_GUI_SRC_MOC) \
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	128 $(OCTAVE_GUI_EDITOR_MOC)
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	129
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	130 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	131
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	132 $(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	133
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	134 DIRSTAMP_FILES += \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	135 %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	136
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	137 octave_gui_UI = \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	138 %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	139
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	140 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	141
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	142 $(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	143
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	144 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	145
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	146 noinst_HEADERS += \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	147 %reldir%/dialog.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	148 %reldir%/octave-dock-widget.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	149 %reldir%/documentation-dock-widget.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	150 %reldir%/external-editor-interface.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	151 %reldir%/files-dock-widget.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	152 %reldir%/history-dock-widget.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	153 %reldir%/m-editor/file-editor-interface.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	154 %reldir%/m-editor/file-editor-tab.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	155 %reldir%/m-editor/file-editor.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	156 %reldir%/m-editor/find-dialog.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	157 %reldir%/m-editor/octave-qscintilla.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	158 %reldir%/m-editor/octave-txt-lexer.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	159 %reldir%/m-editor/marker.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	160 %reldir%/main-window.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	161 %reldir%/octave-gui.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	162 %reldir%/octave-cmd.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	163 %reldir%/octave-qt-link.h \
24475 8cb985e362f3 Allow uncommenting with any kind of comment (bug #52695): Torsten <mttl@mailbox.org> parents: 24135 diff changeset	164 %reldir%/octave-settings.h \
24061 a1801e80bb11 Rename libgui `parser` class to `texinfo_parser` for clarity. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23927 diff changeset	165 %reldir%/qtinfo/texinfo-parser.h \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	166 %reldir%/qtinfo/webinfo.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	167 %reldir%/resource-manager.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	168 %reldir%/settings-dialog.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	169 %reldir%/shortcut-manager.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	170 %reldir%/thread-manager.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	171 %reldir%/terminal-dock-widget.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	172 %reldir%/color-picker.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	173 %reldir%/welcome-wizard.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	174 %reldir%/find-files-dialog.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	175 %reldir%/find-files-model.h \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	176 %reldir%/workspace-model.h \
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	177 %reldir%/workspace-view.h \
e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	178 %reldir%/variable-editor.h \
e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	179 %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	180
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	181 %canon_reldir%_%canon_reldir%_la_SOURCES = \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	182 %reldir%/dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	183 %reldir%/documentation-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	184 %reldir%/external-editor-interface.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	185 %reldir%/files-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	186 %reldir%/history-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	187 %reldir%/m-editor/file-editor-tab.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	188 %reldir%/m-editor/file-editor.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	189 %reldir%/m-editor/find-dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	190 %reldir%/m-editor/octave-qscintilla.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	191 %reldir%/m-editor/octave-txt-lexer.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	192 %reldir%/m-editor/marker.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	193 %reldir%/main-window.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	194 %reldir%/octave-cmd.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	195 %reldir%/octave-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	196 %reldir%/octave-gui.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	197 %reldir%/octave-qt-link.cc \
24061 a1801e80bb11 Rename libgui `parser` class to `texinfo_parser` for clarity. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 23927 diff changeset	198 %reldir%/qtinfo/texinfo-parser.cc \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	199 %reldir%/qtinfo/webinfo.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	200 %reldir%/resource-manager.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	201 %reldir%/settings-dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	202 %reldir%/shortcut-manager.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	203 %reldir%/thread-manager.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	204 %reldir%/terminal-dock-widget.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	205 %reldir%/color-picker.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	206 %reldir%/welcome-wizard.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	207 %reldir%/find-files-dialog.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	208 %reldir%/find-files-model.cc \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	209 %reldir%/workspace-model.cc \
23927 e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	210 %reldir%/workspace-view.cc \
e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	211 %reldir%/variable-editor.cc \
e3a36f84d01d provide variable-editor widget for the GUI Michael Barnes <mjbcode@runbox.com> parents: 23495 diff changeset	212 %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	213
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	214 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	215 $(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	216 $(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	217
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	218 %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	219 $(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	220 $(FT2_CPPFLAGS) \
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: 18269 diff changeset	221 $(FONTCONFIG_CPPFLAGS) \
15363 482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	222 @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	223 @QT_CPPFLAGS@ \
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	224 -I$(srcdir)/libgui/qterminal/libqterminal \
8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	225 -Ilibgui/src -I$(srcdir)/libgui/src \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	226 -I$(srcdir)/%reldir%/m-editor \
8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	227 -I$(srcdir)/%reldir%/qtinfo \
20326 8ef616eec739 eliminate recursive make invocation in libgui directory tree John W. Eaton <jwe@octave.org> parents: 19900 diff changeset	228 -I$(srcdir)/libgui/graphics \
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	229 -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	230 -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	231 -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	232 -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	233 -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	234 -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	235 -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	236 -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	237 -I$(srcdir)/libinterp/octave-value \
21941 1d23b75cbcd1 hide signal.h from C++ sources John W. Eaton <jwe@octave.org> parents: 21608 diff changeset	238 -I$(srcdir)/liboctave/wrappers
15363 482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	239
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	240 %canon_reldir%_%canon_reldir%_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	241
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	242 %canon_reldir%_%canon_reldir%_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	243
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	244 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	245
20366 9b44691a3520 provide per-directory clean targets John W. Eaton <jwe@octave.org> parents: 20326 diff changeset	246 libgui_EXTRA_DIST += \
23495 8308417aff1c use automake %reldir% feature John W. Eaton <jwe@octave.org> parents: 23427 diff changeset	247 %reldir%/resource.qrc \
20366 9b44691a3520 provide per-directory clean targets John W. Eaton <jwe@octave.org> parents: 20326 diff changeset	248 $(octave_gui_UI) \
9b44691a3520 provide per-directory clean targets John W. Eaton <jwe@octave.org> parents: 20326 diff changeset	249 $(octave_gui_ICONS)
9b44691a3520 provide per-directory clean targets John W. Eaton <jwe@octave.org> parents: 20326 diff changeset	250
9b44691a3520 provide per-directory clean targets John W. Eaton <jwe@octave.org> parents: 20326 diff changeset	251 libgui_CLEANFILES += \
15392 c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	252 $(octave_gui_MOC) \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	253 $(octave_gui_UI_H) \
23427 48fd5980e29a Refactor and normalize generated build info source files Mike Miller <mtmiller@octave.org> parents: 23426 diff changeset	254 $(octave_gui_RC)

Mercurial > octave

annotate libgui/src/module.mk @ 24475:8cb985e362f3