Mercurial > hg > octave-shane
changeset 15392:c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
* libgui/Makefile.am: Re-arrange order of definitions and rules to follow
same ordering as liboctave.
* libgui/qterminal-module.mk: Re-arrange definition to keep line length
less than 80 characters.
* libgui/src/module.mk: Re-arrange order of definitions and rules to follow
same ordering as in liboctave module.mk files.
author | Rik <rik@octave.org> |
---|---|
date | Sat, 15 Sep 2012 11:10:07 -0700 |
parents | 1ddf5772fb1a |
children | b99c52303d0b |
files | libgui/Makefile.am libgui/qterminal-module.mk libgui/src/module.mk |
diffstat | 3 files changed, 96 insertions(+), 93 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/Makefile.am +++ b/libgui/Makefile.am @@ -36,9 +36,9 @@ EXTRA_DIST = default-qt-settings -BUILT_SOURCES = +CLEANFILES = -CLEANFILES = +BUILT_SOURCES = noinst_HEADERS = @@ -47,13 +47,13 @@ include src/module.mk include qterminal-module.mk -## libocgui merely collects of compiled convenience libraries. +## liboctgui merely collects a bunch of compiled convenience libraries. ## It has no source code itself. liboctgui_la_SOURCES = include link-deps.mk -# Dummy C++ source to cause C++ linking. +# Dummy C++ source to force C++ linking. nodist_EXTRA_liboctgui_la_SOURCES = dummy.cc liboctgui_la_LIBADD = \
--- a/libgui/qterminal-module.mk +++ b/libgui/qterminal-module.mk @@ -50,7 +50,9 @@ qterminal/libqterminal/win32/QTerminalColors.cpp \ qterminal/libqterminal/win32/QWinTerminalImpl.cpp -qterminal_libqterminal_la_MOC += qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc +qterminal_libqterminal_la_MOC += \ + qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc + qterminal_libqterminal_la_CPPFLAGS += -DUNICODE # This flag is required to let MOC know about Q_OS_WIN32.
--- a/libgui/src/module.mk +++ b/libgui/src/module.mk @@ -4,94 +4,6 @@ $(octave_gui_UI) \ $(octave_gui_ICONS) -octave_gui_MOC = \ - src/m-editor/moc-file-editor-interface.cc \ - src/m-editor/moc-file-editor-tab.cc \ - src/m-editor/moc-file-editor.cc \ - src/m-editor/moc-find-dialog.cc \ - src/m-editor/moc-lexer-octave-gui.cc \ - src/moc-documentation-dockwidget.cc \ - src/moc-files-dockwidget.cc \ - src/moc-history-dockwidget.cc \ - src/moc-main-window.cc \ - src/moc-octave-qt-event-listener.cc \ - src/moc-settings-dialog.cc \ - src/moc-terminal-dockwidget.cc \ - src/moc-welcome-wizard.cc \ - src/moc-workspace-model.cc \ - src/moc-workspace-view.cc \ - src/octave-adapter/moc-octave-main-thread.cc \ - src/qtinfo/moc-parser.cc \ - src/qtinfo/moc-webinfo.cc - -octave_gui_UI = \ - src/settings-dialog.ui \ - src/welcome-wizard.ui - -octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) - -octave_gui_RC = src/qrc-resource.cc - -src_libgui_src_la_SOURCES = \ - src/documentation-dockwidget.cc \ - src/files-dockwidget.cc \ - src/history-dockwidget.cc \ - src/m-editor/file-editor-tab.cc \ - src/m-editor/file-editor.cc \ - src/m-editor/find-dialog.cc \ - src/m-editor/lexer-octave-gui.cc \ - src/main-window.cc \ - src/octave-adapter/octave-event.cc \ - src/octave-adapter/octave-link.cc \ - src/octave-adapter/octave-main-thread.cc \ - src/octave-gui.cc \ - src/octave-qt-event-listener.cc \ - src/qtinfo/parser.cc \ - src/qtinfo/webinfo.cc \ - src/resource-manager.cc \ - src/settings-dialog.cc \ - src/symbol-information.cc \ - src/terminal-dockwidget.cc \ - src/welcome-wizard.cc \ - src/workspace-model.cc \ - src/workspace-view.cc - -nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) - -noinst_HEADERS += \ - src/documentation-dockwidget.h \ - src/files-dockwidget.h \ - src/history-dockwidget.h \ - src/m-editor/file-editor-interface.h \ - src/m-editor/file-editor-tab.h \ - src/m-editor/file-editor.h \ - src/m-editor/find-dialog.h \ - src/m-editor/lexer-octave-gui.h \ - src/main-window.h \ - src/octave-adapter/octave-event-listener.h \ - src/octave-adapter/octave-event-observer.h \ - src/octave-adapter/octave-event.h \ - src/octave-adapter/octave-link.h \ - src/octave-adapter/octave-main-thread.h \ - src/octave-gui.h \ - src/octave-qt-event-listener.h \ - src/qtinfo/parser.h \ - src/qtinfo/webinfo.h \ - src/resource-manager.h \ - src/settings-dialog.h \ - src/symbol-information.h \ - src/terminal-dockwidget.h \ - src/welcome-wizard.h \ - src/workspace-model.h \ - src/workspace-view.h - -CLEANFILES += \ - $(octave_gui_MOC) \ - $(octave_gui_UI_H) \ - $(octave_gui_RC) - -BUILT_SOURCES += $(octave_gui_UI_H) - octave_gui_ICONS = \ src/icons/arrow_right.png \ src/icons/artsbuilderexecute.png \ @@ -131,6 +43,89 @@ src/icons/zoom-in.png \ src/icons/zoom-out.png +octave_gui_MOC = \ + src/m-editor/moc-file-editor-interface.cc \ + src/m-editor/moc-file-editor-tab.cc \ + src/m-editor/moc-file-editor.cc \ + src/m-editor/moc-find-dialog.cc \ + src/m-editor/moc-lexer-octave-gui.cc \ + src/moc-documentation-dockwidget.cc \ + src/moc-files-dockwidget.cc \ + src/moc-history-dockwidget.cc \ + src/moc-main-window.cc \ + src/moc-octave-qt-event-listener.cc \ + src/moc-settings-dialog.cc \ + src/moc-terminal-dockwidget.cc \ + src/moc-welcome-wizard.cc \ + src/moc-workspace-model.cc \ + src/moc-workspace-view.cc \ + src/octave-adapter/moc-octave-main-thread.cc \ + src/qtinfo/moc-parser.cc \ + src/qtinfo/moc-webinfo.cc + +octave_gui_RC = src/qrc-resource.cc + +octave_gui_UI = \ + src/settings-dialog.ui \ + src/welcome-wizard.ui + +octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) + +BUILT_SOURCES += $(octave_gui_UI_H) + +noinst_HEADERS += \ + src/documentation-dockwidget.h \ + src/files-dockwidget.h \ + src/history-dockwidget.h \ + src/m-editor/file-editor-interface.h \ + src/m-editor/file-editor-tab.h \ + src/m-editor/file-editor.h \ + src/m-editor/find-dialog.h \ + src/m-editor/lexer-octave-gui.h \ + src/main-window.h \ + src/octave-adapter/octave-event-listener.h \ + src/octave-adapter/octave-event-observer.h \ + src/octave-adapter/octave-event.h \ + src/octave-adapter/octave-link.h \ + src/octave-adapter/octave-main-thread.h \ + src/octave-gui.h \ + src/octave-qt-event-listener.h \ + src/qtinfo/parser.h \ + src/qtinfo/webinfo.h \ + src/resource-manager.h \ + src/settings-dialog.h \ + src/symbol-information.h \ + src/terminal-dockwidget.h \ + src/welcome-wizard.h \ + src/workspace-model.h \ + src/workspace-view.h + +src_libgui_src_la_SOURCES = \ + src/documentation-dockwidget.cc \ + src/files-dockwidget.cc \ + src/history-dockwidget.cc \ + src/m-editor/file-editor-tab.cc \ + src/m-editor/file-editor.cc \ + src/m-editor/find-dialog.cc \ + src/m-editor/lexer-octave-gui.cc \ + src/main-window.cc \ + src/octave-adapter/octave-event.cc \ + src/octave-adapter/octave-link.cc \ + src/octave-adapter/octave-main-thread.cc \ + src/octave-gui.cc \ + src/octave-qt-event-listener.cc \ + src/qtinfo/parser.cc \ + src/qtinfo/webinfo.cc \ + src/resource-manager.cc \ + src/settings-dialog.cc \ + src/symbol-information.cc \ + src/terminal-dockwidget.cc \ + src/welcome-wizard.cc \ + src/workspace-model.cc \ + src/workspace-view.cc + +nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) + src_libgui_src_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ @@ -160,3 +155,9 @@ src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) noinst_LTLIBRARIES += src/libgui-src.la + +CLEANFILES += \ + $(octave_gui_MOC) \ + $(octave_gui_UI_H) \ + $(octave_gui_RC) +