Mercurial > hg > octave-lyh
comparison libgui/src/module.mk @ 16291:c22a6cecaedd
build: Use AMCOND to build GUI editor if Qscintilla available.
* configure.ac: Add new AMCOND_HAVE_QSCINTILLA Automake Conditional.
* libgui/src/m-editor/file-editor-interface.h,
libgui/src/m-editor/file-editor-tab.h, libgui/src/m-editor/file-editor.h,
libgui/src/m-editor/find-dialog.h, libgui/src/m-editor/lexer-octave-gui.h:
Remove '#ifdef HAVE_QSCINTILLA' declarations
* libgui/src/module.mk: Check AMCOND_HAVE_QSCINTILLA before adding
GUI editor files to octave_gui_MOC variable.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 12 Mar 2013 19:03:07 -0700 |
| parents | c3057d80cf91 |
| children | 7fa90eb41240 |
comparison
equal
deleted
inserted
replaced
| 16290:d07aeecb2d22 | 16291:c22a6cecaedd |
|---|---|
| 53 src/icons/undo.png \ | 53 src/icons/undo.png \ |
| 54 src/icons/up.png \ | 54 src/icons/up.png \ |
| 55 src/icons/zoom-in.png \ | 55 src/icons/zoom-in.png \ |
| 56 src/icons/zoom-out.png | 56 src/icons/zoom-out.png |
| 57 | 57 |
| 58 octave_gui_MOC = \ | 58 octave_gui_MOC = |
| 59 | |
| 60 if AMCOND_HAVE_QSCINTILLA | |
| 61 octave_gui_MOC += \ | |
| 59 src/m-editor/moc-file-editor-interface.cc \ | 62 src/m-editor/moc-file-editor-interface.cc \ |
| 60 src/m-editor/moc-file-editor-tab.cc \ | 63 src/m-editor/moc-file-editor-tab.cc \ |
| 61 src/m-editor/moc-file-editor.cc \ | 64 src/m-editor/moc-file-editor.cc \ |
| 62 src/m-editor/moc-find-dialog.cc \ | 65 src/m-editor/moc-find-dialog.cc \ |
| 63 src/m-editor/moc-lexer-octave-gui.cc \ | 66 src/m-editor/moc-lexer-octave-gui.cc |
| 67 endif | |
| 68 | |
| 69 octave_gui_MOC += \ | |
| 64 src/moc-documentation-dockwidget.cc \ | 70 src/moc-documentation-dockwidget.cc \ |
| 65 src/moc-files-dockwidget.cc \ | 71 src/moc-files-dockwidget.cc \ |
| 66 src/moc-history-dockwidget.cc \ | 72 src/moc-history-dockwidget.cc \ |
| 67 src/moc-main-window.cc \ | 73 src/moc-main-window.cc \ |
| 68 src/moc-octave-qt-event-listener.cc \ | 74 src/moc-octave-qt-event-listener.cc \ |