octave-nkf: libgui/src/Makefile.am annotate

annotate libgui/src/Makefile.am @ 15272:dd794aa84232

additional changes for merger of libcruft with liboctave * libgui/src/Makefile.am (AM_CPPFLAGS): Include -I../../liboctave/numeric, -I../../liboctave/operators, --I$(srcdir)/../../liboctave/array, --I$(srcdir)/../../liboctave/numeric, --I$(srcdir)/../../liboctave/operators, --I$(srcdir)/../../liboctave/system, and -I$(srcdir)/../../liboctave/util in the list. * libinterp/link-deps.mk (LIBOCTINTERP_LINK_DEPS): Delete $(GNULIB_LINK_DEPS) from the list. * liboctave/Makefile.am (liboctae_la_LIBADD): Include cruft/ranlib/libranlib.la and ../libgnu/libgnu.la in the list. * liboctave/cruft/link-deps.mk: Delete. * liboctave/cruft/Makefile.am (noinst_LTLIBRARIES): Rename from octlib_LTLIBRARIES. Don't include link-deps.mk. (libcruft_la_LIBADD, libcruft_current, libcruft_revision, libcruft_age, libcruft_la_LDFLAGS): Delete. Build libranlib.la in ranlib subdirectory. * module.mk (ranlib_libranlib_la_SOURCES): Rename from libranlib_la_SOURCES. * liboctave/link-deps.mk: Don't include $(top_srcdir)/liboctave/cruft/link-deps.mk. (GNULIB_LINK_DEPS): Move definition here from liboctave/cruft/link-deps.mk. (LIBOCTAVE_LINK_DEPS): Include $(FLIBS) in the list. Don't add $(LIBCRUFT_LINK_DEPS) to LIBOCTAVE_LINK_DEPS. Don't add $(LIBCRUFT_LINK_OPTS) to LIBOCTAVE_LINK_OPTS. * liboctave/operators/module.mk: Use correct names for mk-ops.awk script and mx-ops, vx-ops, and sparse-mx-ops files. * src/Makefile.am (AM_CPPFLAGS): Include -I$(srcdir)/../liboctave/array, -I$(srcdir)/../liboctave/numeric, and -I$(srcdir)/../liboctave/util in the list. Include -I$(srcdir)/../liboctave/cruft/misc in the list, not -I$(srcdir)/../libcruft/misc.

author	John W. Eaton <jwe@octave.org>
date	Sat, 01 Sep 2012 10:46:45 -0400
parents	648dabbb4c6b
children	2b3eaec99a38

rev	line source
15206 38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	1 # Copyright (C) 2012 John W. Eaton
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	2 #
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	3 # This file is part of Octave.
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	4 #
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	5 # Octave is free software; you can redistribute it and/or modify it
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	6 # under the terms of the GNU General Public License as published by the
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	7 # Free Software Foundation; either version 3 of the License, or (at
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	8 # your option) any later version.
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	9 #
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	10 # Octave is distributed in the hope that it will be useful, but WITHOUT
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	11 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	12 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	13 # for more details.
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	14 #
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	15 # You should have received a copy of the GNU General Public License
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	16 # along with Octave; see the file COPYING. If not, see
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	17 # <http://www.gnu.org/licenses/>.
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	18
15178 ae658d7b6870 Include common build configuration in gui/src Mike Miller <mtmiller@ieee.org> parents: 15159 diff changeset	19 include $(top_srcdir)/build-aux/common.mk
ae658d7b6870 Include common build configuration in gui/src Mike Miller <mtmiller@ieee.org> parents: 15159 diff changeset	20
15208 2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	21 QT_INCDIR = @QT_INCDIR@
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	22
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	23 QT_LIBDIR = @QT_LIBDIR@
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	24
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	25 QT_LIBS = -lQtCore -lQtGui -lQtNetwork -lqscintilla2
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	26
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	27 QT_LDFLAGS = -L$(QT_LIBDIR)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	28
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	29 MOC_CPPFLAGS =
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	30
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	31 SRCDIRS = \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	32 m-editor \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	33 qtinfo \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	34 octave-adapter \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	35 ../qterminal/libqterminal/unix \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	36 ../qterminal/libqterminal/win32 \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	37 ../qterminal/libqterminal \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	38 ../qterminal
15117 3735a0e783cb more tweaks for the gui build John W. Eaton <jwe@octave.org> parents: 15116 diff changeset	39
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	40 octave_gui_MOC = \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	41 m-editor/moc-file-editor-interface.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	42 m-editor/moc-file-editor-tab.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	43 m-editor/moc-file-editor.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	44 m-editor/moc-find-dialog.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	45 m-editor/moc-lexer-octave-gui.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	46 moc-documentation-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	47 moc-files-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	48 moc-history-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	49 moc-main-window.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	50 moc-octave-qt-event-listener.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	51 moc-settings-dialog.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	52 moc-terminal-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	53 moc-welcome-wizard.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	54 moc-workspace-model.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	55 moc-workspace-view.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	56 octave-adapter/moc-octave-main-thread.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	57 qtinfo/moc-parser.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	58 qtinfo/moc-webinfo.cc
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	59
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	60 octave_gui_UI = \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	61 settings-dialog.ui \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	62 welcome-wizard.ui
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	63
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	64 octave_gui_UI_H = $(patsubst %.ui, ui-%.h, $(octave_gui_UI))
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	65
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	66 octave_gui_RC = qrc-resource.cc
15116 3d7a7ae53bbf Further integration of GUI in the build system. Michael Goffioul <michael.goffioul@gmail.com> parents: 15114 diff changeset	67
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	68 octlib_LTLIBRARIES = liboctgui.la
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	69
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	70 liboctgui_la_SOURCES = \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	71 documentation-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	72 files-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	73 history-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	74 m-editor/file-editor-tab.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	75 m-editor/file-editor.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	76 m-editor/find-dialog.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	77 m-editor/lexer-octave-gui.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	78 main-window.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	79 octave-adapter/octave-event.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	80 octave-adapter/octave-link.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	81 octave-adapter/octave-main-thread.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	82 octave-gui.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	83 octave-qt-event-listener.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	84 qtinfo/parser.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	85 qtinfo/webinfo.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	86 resource-manager.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	87 settings-dialog.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	88 symbol-information.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	89 terminal-dockwidget.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	90 welcome-wizard.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	91 workspace-model.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	92 workspace-view.cc
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	93
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	94 nodist_liboctgui_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	95
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	96 liboctgui_la_CPPFLAGS = \
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	97 @OCTGUI_DLL_DEFS@ \
15208 2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	98 -I$(QT_INCDIR) \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	99 -I$(QT_INCDIR)/QtCore \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	100 -I$(QT_INCDIR)/QtGui \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	101 -I$(QT_INCDIR)/QtNetwork \
15139 bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	102 -I$(srcdir)/../qterminal/libqterminal \
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	103 -I$(srcdir)/m-editor \
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	104 -I$(srcdir)/octave-adapter \
bfc220d1de67 include gui in default Octave binary John W. Eaton <jwe@octave.org> parents: 15117 diff changeset	105 -I$(srcdir)/qtinfo \
15272 dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	106 -I../../liboctave \
dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	107 -I../../liboctave/numeric \
dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	108 -I../../liboctave/operators \
dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	109 -I$(srcdir)/../../liboctave \
dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	110 -I$(srcdir)/../../liboctave/array \
15271 648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave. Rik <rik@octave.org> parents: 15257 diff changeset	111 -I$(srcdir)/../../liboctave/cruft/misc \
15272 dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	112 -I$(srcdir)/../../liboctave/numeric \
dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	113 -I$(srcdir)/../../liboctave/operators \
dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	114 -I$(srcdir)/../../liboctave/system \
dd794aa84232 additional changes for merger of libcruft with liboctave John W. Eaton <jwe@octave.org> parents: 15271 diff changeset	115 -I$(srcdir)/../../liboctave/util \
15195 2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	116 -I../../libinterp \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	117 -I../../libinterp/interp-core \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	118 -I../../libinterp/interpfcn \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	119 -I../../libinterp/parse-tree \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	120 -I$(srcdir)/../../libinterp \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	121 -I$(srcdir)/../../libinterp/interp-core \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	122 -I$(srcdir)/../../libinterp/interpfcn \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	123 -I$(srcdir)/../../libinterp/octave-value \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	124 -I$(srcdir)/../../libtinerp/operators \
2fc554ffbc28 split libinterp from src John W. Eaton <jwe@octave.org> parents: 15178 diff changeset	125 -I$(srcdir)/../../libinterp/parse-tree
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	126
15208 2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	127 include link-deps.mk
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	128
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	129 liboctgui_la_LIBADD = \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	130 libqterminal.la \
15210 26115efd6592 link liboctgui with liboctinterp.la John W. Eaton <jwe@octave.org> parents: 15208 diff changeset	131 ../../libinterp/liboctinterp.la \
15208 2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	132 ../../liboctave/liboctave.la \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	133 $(LIBOCTGUI_LINK_DEPS)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	134
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	135 # Increment these as needed and according to the rules in the libtool manual:
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	136 liboctgui_current = 0
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	137 liboctgui_revision = 0
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	138 liboctgui_age = 0
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	139
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	140 liboctgui_version_info = $(liboctgui_current):$(liboctgui_revision):$(liboctgui_age)
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	141
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	142 liboctgui_la_LDFLAGS = \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	143 -version-info $(liboctgui_version_info) \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	144 $(NO_UNDEFINED_LDFLAG) \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	145 -bindir $(bindir) \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	146 $(LIBOCTGUI_LINK_OPTS)
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	147
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	148 noinst_HEADERS = \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	149 documentation-dockwidget.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	150 files-dockwidget.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	151 history-dockwidget.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	152 m-editor/file-editor-interface.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	153 m-editor/file-editor-tab.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	154 m-editor/file-editor.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	155 m-editor/find-dialog.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	156 m-editor/lexer-octave-gui.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	157 main-window.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	158 octave-adapter/octave-event-listener.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	159 octave-adapter/octave-event-observer.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	160 octave-adapter/octave-event.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	161 octave-adapter/octave-link.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	162 octave-adapter/octave-main-thread.h \
15199 d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	163 octave-gui.h \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	164 octave-qt-event-listener.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	165 qtinfo/parser.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	166 qtinfo/webinfo.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	167 resource-manager.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	168 settings-dialog.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	169 symbol-information.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	170 terminal-dockwidget.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	171 welcome-wizard.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	172 workspace-model.h \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	173 workspace-view.h
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	174
15116 3d7a7ae53bbf Further integration of GUI in the build system. Michael Goffioul <michael.goffioul@gmail.com> parents: 15114 diff changeset	175 CLEANFILES = $(octave_gui_MOC) $(octave_gui_UI_H) $(octave_gui_RC)
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	176
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	177 clean-local:
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	178 -if test "$(srcdir)" != "."; then \
15206 38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	179 for d in $(SRCDIRS); do test -d $$d && rmdir $$d; done \
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	180 fi
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	181
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	182 BUILT_SOURCES = $(octave_gui_UI_H)
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	183
15199 d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	184 octave_gui_ICONS = \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	185 icons/arrow_right.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	186 icons/artsbuilderexecute.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	187 icons/bookmark.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	188 icons/bp_next.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	189 icons/bp_prev.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	190 icons/bp_rm_all.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	191 icons/bp_toggle.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	192 icons/chat.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	193 icons/configure.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	194 icons/db_cont.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	195 icons/db_step_in.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	196 icons/db_step_out.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	197 icons/db_step.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	198 icons/db_stop.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	199 icons/editcopy.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	200 icons/editcut.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	201 icons/editpaste.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	202 icons/filenew.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	203 icons/fileopen.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	204 icons/filesaveas.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	205 icons/filesave.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	206 icons/find.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	207 icons/help_index.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	208 icons/icons_license \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	209 icons/jabber_protocol.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	210 icons/logo.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	211 icons/question.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	212 icons/redled.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	213 icons/redo.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	214 icons/search.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	215 icons/star.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	216 icons/stop.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	217 icons/terminal.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	218 icons/undo.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	219 icons/up.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	220 icons/zoom-in.png \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	221 icons/zoom-out.png
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	222
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	223 EXTRA_DIST = \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	224 $(octave_gui_UI) \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	225 $(octave_gui_ICONS) \
d0715b430286 fix gui sources missing from dist John W. Eaton <jwe@octave.org> parents: 15196 diff changeset	226 resource.qrc
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	227
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	228 noinst_LTLIBRARIES = libqterminal.la
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	229
15206 38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	230 noinst_HEADERS += \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	231 ../qterminal/libqterminal/QTerminal.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	232 ../qterminal/libqterminal/QTerminalInterface.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	233 ../qterminal/libqterminal/win32/QTerminalColors.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	234 ../qterminal/libqterminal/win32/QWinTerminalImpl.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	235 ../qterminal/libqterminal/unix/BlockArray.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	236 ../qterminal/libqterminal/unix/Character.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	237 ../qterminal/libqterminal/unix/CharacterColor.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	238 ../qterminal/libqterminal/unix/Emulation.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	239 ../qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	240 ../qterminal/libqterminal/unix/Filter.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	241 ../qterminal/libqterminal/unix/History.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	242 ../qterminal/libqterminal/unix/KeyboardTranslator.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	243 ../qterminal/libqterminal/unix/konsole_wcwidth.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	244 ../qterminal/libqterminal/unix/kpty.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	245 ../qterminal/libqterminal/unix/kpty_p.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	246 ../qterminal/libqterminal/unix/LineFont.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	247 ../qterminal/libqterminal/unix/QUnixTerminalImpl.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	248 ../qterminal/libqterminal/unix/Screen.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	249 ../qterminal/libqterminal/unix/ScreenWindow.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	250 ../qterminal/libqterminal/unix/TerminalCharacterDecoder.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	251 ../qterminal/libqterminal/unix/Vt102Emulation.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	252 ../qterminal/libqterminal/unix/SelfListener.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	253 ../qterminal/libqterminal/unix/TerminalModel.h \
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	254 ../qterminal/libqterminal/unix/TerminalView.h
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	255
15206 38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	256 libqterminal_la_CPPFLAGS = \
15208 2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	257 -I$(QT_INCDIR) \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	258 -I$(QT_INCDIR)/QtCore \
2a36a5b89f98 link gui in way that is more consistent with the rest of Octave John W. Eaton <jwe@octave.org> parents: 15206 diff changeset	259 -I$(QT_INCDIR)/QtGui \
15206 38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	260 -I$(srcdir)/../qterminal/libqterminal
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	261
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	262 libqterminal_la_MOC = \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	263 ../qterminal/libqterminal/moc-QTerminal.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	264 ../qterminal/libqterminal/moc-QTerminalInterface.cc
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	265
15116 3d7a7ae53bbf Further integration of GUI in the build system. Michael Goffioul <michael.goffioul@gmail.com> parents: 15114 diff changeset	266 nodist_libqterminal_la_SOURCES = $(libqterminal_la_MOC)
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	267
4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	268 if WIN32_TERMINAL
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	269
15116 3d7a7ae53bbf Further integration of GUI in the build system. Michael Goffioul <michael.goffioul@gmail.com> parents: 15114 diff changeset	270 libqterminal_la_SOURCES = \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	271 ../qterminal/libqterminal/win32/QTerminalColors.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	272 ../qterminal/libqterminal/win32/QWinTerminalImpl.cpp
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	273
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	274 libqterminal_la_MOC += ../qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	275 libqterminal_la_CPPFLAGS += -DUNICODE
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	276
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	277 # This flag is required to let MOC know about Q_OS_WIN32.
7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	278 MOC_CPPFLAGS += -DWIN32
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	279
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	280 else
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	281
15116 3d7a7ae53bbf Further integration of GUI in the build system. Michael Goffioul <michael.goffioul@gmail.com> parents: 15114 diff changeset	282 libqterminal_la_SOURCES = \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	283 ../qterminal/libqterminal/unix/BlockArray.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	284 ../qterminal/libqterminal/unix/Emulation.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	285 ../qterminal/libqterminal/unix/Filter.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	286 ../qterminal/libqterminal/unix/History.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	287 ../qterminal/libqterminal/unix/KeyboardTranslator.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	288 ../qterminal/libqterminal/unix/konsole_wcwidth.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	289 ../qterminal/libqterminal/unix/kpty.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	290 ../qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	291 ../qterminal/libqterminal/unix/Screen.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	292 ../qterminal/libqterminal/unix/ScreenWindow.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	293 ../qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	294 ../qterminal/libqterminal/unix/Vt102Emulation.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	295 ../qterminal/libqterminal/unix/SelfListener.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	296 ../qterminal/libqterminal/unix/TerminalModel.cpp \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	297 ../qterminal/libqterminal/unix/TerminalView.cpp
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	298
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	299 libqterminal_la_MOC += \
15156 141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	300 ../qterminal/libqterminal/unix/moc-Emulation.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	301 ../qterminal/libqterminal/unix/moc-Filter.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	302 ../qterminal/libqterminal/unix/moc-QUnixTerminalImpl.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	303 ../qterminal/libqterminal/unix/moc-ScreenWindow.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	304 ../qterminal/libqterminal/unix/moc-SelfListener.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	305 ../qterminal/libqterminal/unix/moc-TerminalModel.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	306 ../qterminal/libqterminal/unix/moc-TerminalView.cc \
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	307 ../qterminal/libqterminal/unix/moc-Vt102Emulation.cc
141b0b108292 allow building without gui to work John W. Eaton <jwe@octave.org> parents: 15155 diff changeset	308
15110 4f6e058e4161 Integrate GUI building with regular octave build system. Michael Goffioul <michael.goffioul@gmail.com> parents: diff changeset	309 endif
15114 9300ee32d6ff Be more conservative during "mkae clean" Michael Goffioul <michael.goffioul@gmail.com> parents: 15110 diff changeset	310
15206 38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	311 moc-%.cc: %.h
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	312 test -d $(@D) \|\| mkdir -p $(@D)
15257 7ee62f559a73 Fix compilation under Windows with GUI and LLVM enabled. Michael Goffioul <michael.goffioul@gmail.com> parents: 15210 diff changeset	313 @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $<
15206 38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	314
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	315 ui-%.h: %.ui
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	316 @UIC@ -o $@ $<
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	317
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	318 qrc-%.cc: %.qrc
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	319 @RCC@ -o $@ $<
38d8306e7df1 * libgui/Makefile.am, libgui/src/Makefile.am: Style fixes. John W. Eaton <jwe@octave.org> parents: 15199 diff changeset	320
15114 9300ee32d6ff Be more conservative during "mkae clean" Michael Goffioul <michael.goffioul@gmail.com> parents: 15110 diff changeset	321 CLEANFILES += $(libqterminal_la_MOC)

Mercurial > octave-nkf

annotate libgui/src/Makefile.am @ 15272:dd794aa84232