Mercurial > hg > octave-lyh
annotate libgui/src/module.mk @ 15391:1ddf5772fb1a
fix broken libgui build
* libgui/Makefile.am (liboctgui_la_SOURCES): New variable.
* libgui/src/module.mk (src_libgui_src_la_SOURCES): Rename from
liboctgui_la_SOURCES.
(nodist_src_libgui_src_la_SOURCES): Rename from
nodist_liboctgui_la_SOURCES.
(src_libgui_src_la_CPPFLAGS): Rename from liboctgui_la_CPPFLAGS.
(src_libgui_src_la_CFLAGS): Rename from liboctgui_la_CFLAGS.
(src_libgui_src_la_CXXFLAGS): Rename from liboctgui_la_CXXFLAGS.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 14 Sep 2012 22:57:00 -0400 |
| parents | 482d92904aa4 |
| children | c7fd43f5a89d |
| rev | line source |
|---|---|
| 15362 | 1 EXTRA_DIST += \ |
| 2 src/module.mk \ | |
| 3 src/resource.qrc \ | |
| 4 $(octave_gui_UI) \ | |
| 5 $(octave_gui_ICONS) | |
| 6 | |
| 7 octave_gui_MOC = \ | |
| 8 src/m-editor/moc-file-editor-interface.cc \ | |
| 9 src/m-editor/moc-file-editor-tab.cc \ | |
| 10 src/m-editor/moc-file-editor.cc \ | |
| 11 src/m-editor/moc-find-dialog.cc \ | |
| 12 src/m-editor/moc-lexer-octave-gui.cc \ | |
| 13 src/moc-documentation-dockwidget.cc \ | |
| 14 src/moc-files-dockwidget.cc \ | |
| 15 src/moc-history-dockwidget.cc \ | |
| 16 src/moc-main-window.cc \ | |
| 17 src/moc-octave-qt-event-listener.cc \ | |
| 18 src/moc-settings-dialog.cc \ | |
| 19 src/moc-terminal-dockwidget.cc \ | |
| 20 src/moc-welcome-wizard.cc \ | |
| 21 src/moc-workspace-model.cc \ | |
| 22 src/moc-workspace-view.cc \ | |
| 23 src/octave-adapter/moc-octave-main-thread.cc \ | |
| 24 src/qtinfo/moc-parser.cc \ | |
| 25 src/qtinfo/moc-webinfo.cc | |
| 26 | |
| 27 octave_gui_UI = \ | |
| 28 src/settings-dialog.ui \ | |
| 29 src/welcome-wizard.ui | |
| 30 | |
| 31 octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) | |
| 32 | |
| 33 octave_gui_RC = src/qrc-resource.cc | |
| 34 | |
| 15391 | 35 src_libgui_src_la_SOURCES = \ |
| 15362 | 36 src/documentation-dockwidget.cc \ |
| 37 src/files-dockwidget.cc \ | |
| 38 src/history-dockwidget.cc \ | |
| 39 src/m-editor/file-editor-tab.cc \ | |
| 40 src/m-editor/file-editor.cc \ | |
| 41 src/m-editor/find-dialog.cc \ | |
| 42 src/m-editor/lexer-octave-gui.cc \ | |
| 43 src/main-window.cc \ | |
| 44 src/octave-adapter/octave-event.cc \ | |
| 45 src/octave-adapter/octave-link.cc \ | |
| 46 src/octave-adapter/octave-main-thread.cc \ | |
| 47 src/octave-gui.cc \ | |
| 48 src/octave-qt-event-listener.cc \ | |
| 49 src/qtinfo/parser.cc \ | |
| 50 src/qtinfo/webinfo.cc \ | |
| 51 src/resource-manager.cc \ | |
| 52 src/settings-dialog.cc \ | |
| 53 src/symbol-information.cc \ | |
| 54 src/terminal-dockwidget.cc \ | |
| 55 src/welcome-wizard.cc \ | |
| 56 src/workspace-model.cc \ | |
| 57 src/workspace-view.cc | |
| 58 | |
| 15391 | 59 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) |
| 15362 | 60 |
| 61 noinst_HEADERS += \ | |
| 62 src/documentation-dockwidget.h \ | |
| 63 src/files-dockwidget.h \ | |
| 64 src/history-dockwidget.h \ | |
| 65 src/m-editor/file-editor-interface.h \ | |
| 66 src/m-editor/file-editor-tab.h \ | |
| 67 src/m-editor/file-editor.h \ | |
| 68 src/m-editor/find-dialog.h \ | |
| 69 src/m-editor/lexer-octave-gui.h \ | |
| 70 src/main-window.h \ | |
| 71 src/octave-adapter/octave-event-listener.h \ | |
| 72 src/octave-adapter/octave-event-observer.h \ | |
| 73 src/octave-adapter/octave-event.h \ | |
| 74 src/octave-adapter/octave-link.h \ | |
| 75 src/octave-adapter/octave-main-thread.h \ | |
| 76 src/octave-gui.h \ | |
| 77 src/octave-qt-event-listener.h \ | |
| 78 src/qtinfo/parser.h \ | |
| 79 src/qtinfo/webinfo.h \ | |
| 80 src/resource-manager.h \ | |
| 81 src/settings-dialog.h \ | |
| 82 src/symbol-information.h \ | |
| 83 src/terminal-dockwidget.h \ | |
| 84 src/welcome-wizard.h \ | |
| 85 src/workspace-model.h \ | |
| 86 src/workspace-view.h | |
| 87 | |
| 88 CLEANFILES += \ | |
| 89 $(octave_gui_MOC) \ | |
| 90 $(octave_gui_UI_H) \ | |
| 91 $(octave_gui_RC) | |
| 92 | |
| 93 BUILT_SOURCES += $(octave_gui_UI_H) | |
| 94 | |
| 95 octave_gui_ICONS = \ | |
| 96 src/icons/arrow_right.png \ | |
| 97 src/icons/artsbuilderexecute.png \ | |
| 98 src/icons/bookmark.png \ | |
| 99 src/icons/bp_next.png \ | |
| 100 src/icons/bp_prev.png \ | |
| 101 src/icons/bp_rm_all.png \ | |
| 102 src/icons/bp_toggle.png \ | |
| 103 src/icons/chat.png \ | |
| 104 src/icons/configure.png \ | |
| 105 src/icons/db_cont.png \ | |
| 106 src/icons/db_step_in.png \ | |
| 107 src/icons/db_step_out.png \ | |
| 108 src/icons/db_step.png \ | |
| 109 src/icons/db_stop.png \ | |
| 110 src/icons/editcopy.png \ | |
| 111 src/icons/editcut.png \ | |
| 112 src/icons/editpaste.png \ | |
| 113 src/icons/filenew.png \ | |
| 114 src/icons/fileopen.png \ | |
| 115 src/icons/filesaveas.png \ | |
| 116 src/icons/filesave.png \ | |
| 117 src/icons/find.png \ | |
| 118 src/icons/help_index.png \ | |
| 119 src/icons/icons_license \ | |
| 120 src/icons/jabber_protocol.png \ | |
| 121 src/icons/logo.png \ | |
| 122 src/icons/question.png \ | |
| 123 src/icons/redled.png \ | |
| 124 src/icons/redo.png \ | |
| 125 src/icons/search.png \ | |
| 126 src/icons/star.png \ | |
| 127 src/icons/stop.png \ | |
| 128 src/icons/terminal.png \ | |
| 129 src/icons/undo.png \ | |
| 130 src/icons/up.png \ | |
| 131 src/icons/zoom-in.png \ | |
| 132 src/icons/zoom-out.png | |
| 133 | |
| 15391 | 134 src_libgui_src_la_CPPFLAGS = \ |
|
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
135 $(AM_CPPFLAGS) \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
136 @OCTGUI_DLL_DEFS@ \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
137 -I$(QT_INCDIR) \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
138 -I$(QT_INCDIR)/QtCore \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
139 -I$(QT_INCDIR)/QtGui \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
140 -I$(QT_INCDIR)/QtNetwork \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
141 -I$(srcdir)/qterminal/libqterminal \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
142 -Isrc -I$(srcdir)/src \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
143 -I$(srcdir)/src/m-editor \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
144 -I$(srcdir)/src/octave-adapter \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
145 -I$(srcdir)/src/qtinfo \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
146 -I$(top_srcdir)/liboctave/cruft/misc \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
147 -I$(top_srcdir)/liboctave/array \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
148 -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
149 -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
150 -I$(top_srcdir)/liboctave/system \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
151 -I$(top_srcdir)/liboctave/util \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
152 -I$(top_srcdir)/libinterp \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
153 -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
154 -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
155 -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
156 -I$(top_srcdir)/libinterp/octave-value |
|
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
157 |
| 15391 | 158 src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) |
|
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
159 |
| 15391 | 160 src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) |
|
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
161 |
| 15362 | 162 noinst_LTLIBRARIES += src/libgui-src.la |