octave-lyh: libgui/src/module.mk annotate

annotate libgui/src/module.mk @ 15596:5f031158c693

Use pkg-config to discover Qt (pkg-config is already a requirement anyway). * build-aux/common.mk (do_subst_config_vals): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * configure.ac: Likewise and use pkg-config to discover the new variables. * libgui/Makefile.am (QT_INCDIR, QT_LIBDIR, QT_LIBS, QT_LDFLAGS): Delete variable definitions. * libgui/link-deps.mk (LIBOCTGUI_LINK_DEPS): Use automake @QT_LIBS@. (LIBOCTGUI_LIK_OPTS): Use automake @QT_LDFLAGS@. * libgui/qterminal-module.mk (qterminal_libqterminal_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. (MOC_CPPFLAGS): Define Q_OS_WIN32 instead of WIN32. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Use automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths. * libinterp/interpfcn/toplev.cc (Foctave_config_info): Replace QT_INCDIR and QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS. * libinterp/oct-conf.in.h: Replace OCTAVE_CONF_QT_INCDIR and OCTAVE_CONF_QT_LIBDIR with OCTAVE_CONF_QT_CPPFLAGS, OCTAVE_CONF_QT_LDFLAGS and OCTAVE_CONF_QT_LIBS. * m4/acinclude.m4 (OCTAVE_CHECK_FUNC_FINDFIRST_MODERN, OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT): Use QT_CPPFLAGS instead of QT_INCDIR.

author	Michael Goffioul <michael.goffioul@gmail.com>
date	Mon, 05 Nov 2012 01:47:49 +0000
parents	f52a62a6db3a
children	06832c90ae7d

rev	line source
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	1 EXTRA_DIST += \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	2 src/module.mk \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	3 src/resource.qrc \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	4 $(octave_gui_UI) \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	5 $(octave_gui_ICONS)
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	6
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	7 octave_gui_ICONS = \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	8 src/icons/arrow_right.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	9 src/icons/artsbuilderexecute.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	10 src/icons/bookmark.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	11 src/icons/bp_next.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	12 src/icons/bp_prev.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	13 src/icons/bp_rm_all.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	14 src/icons/bp_toggle.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	15 src/icons/chat.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	16 src/icons/configure.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	17 src/icons/db_cont.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	18 src/icons/db_step_in.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	19 src/icons/db_step_out.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	20 src/icons/db_step.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	21 src/icons/db_stop.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	22 src/icons/editcopy.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	23 src/icons/editcut.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	24 src/icons/editpaste.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	25 src/icons/filenew.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	26 src/icons/fileopen.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	27 src/icons/filesaveas.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	28 src/icons/filesave.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	29 src/icons/find.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	30 src/icons/help_index.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	31 src/icons/icons_license \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	32 src/icons/jabber_protocol.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	33 src/icons/logo.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	34 src/icons/question.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	35 src/icons/redled.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	36 src/icons/redo.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	37 src/icons/search.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	38 src/icons/star.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	39 src/icons/stop.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	40 src/icons/terminal.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	41 src/icons/undo.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	42 src/icons/up.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	43 src/icons/zoom-in.png \
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	44 src/icons/zoom-out.png
48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	45
15392 c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	46 octave_gui_MOC = \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	47 src/m-editor/moc-file-editor-interface.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	48 src/m-editor/moc-file-editor-tab.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	49 src/m-editor/moc-file-editor.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	50 src/m-editor/moc-find-dialog.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	51 src/m-editor/moc-lexer-octave-gui.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	52 src/moc-documentation-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	53 src/moc-files-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	54 src/moc-history-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	55 src/moc-main-window.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	56 src/moc-octave-qt-event-listener.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	57 src/moc-settings-dialog.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	58 src/moc-terminal-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	59 src/moc-welcome-wizard.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	60 src/moc-workspace-model.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	61 src/moc-workspace-view.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	62 src/octave-adapter/moc-octave-main-thread.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	63 src/qtinfo/moc-parser.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	64 src/qtinfo/moc-webinfo.cc
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	65
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	66 octave_gui_RC = src/qrc-resource.cc
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	67
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	68 octave_gui_UI = \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	69 src/settings-dialog.ui \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	70 src/welcome-wizard.ui
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	71
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	72 octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI))
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	73
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	74 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	75
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	76 noinst_HEADERS += \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	77 src/documentation-dockwidget.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	78 src/files-dockwidget.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	79 src/history-dockwidget.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	80 src/m-editor/file-editor-interface.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	81 src/m-editor/file-editor-tab.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	82 src/m-editor/file-editor.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	83 src/m-editor/find-dialog.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	84 src/m-editor/lexer-octave-gui.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	85 src/main-window.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	86 src/octave-adapter/octave-event-listener.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	87 src/octave-adapter/octave-link.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	88 src/octave-adapter/octave-main-thread.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	89 src/octave-gui.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	90 src/octave-qt-event-listener.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	91 src/qtinfo/parser.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	92 src/qtinfo/webinfo.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	93 src/resource-manager.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	94 src/settings-dialog.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	95 src/symbol-information.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	96 src/terminal-dockwidget.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	97 src/welcome-wizard.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	98 src/workspace-model.h \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	99 src/workspace-view.h
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	100
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	101 src_libgui_src_la_SOURCES = \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	102 src/documentation-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	103 src/files-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	104 src/history-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	105 src/m-editor/file-editor-tab.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	106 src/m-editor/file-editor.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	107 src/m-editor/find-dialog.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	108 src/m-editor/lexer-octave-gui.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	109 src/main-window.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	110 src/octave-adapter/octave-link.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	111 src/octave-adapter/octave-main-thread.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	112 src/octave-gui.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	113 src/octave-qt-event-listener.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	114 src/qtinfo/parser.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	115 src/qtinfo/webinfo.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	116 src/resource-manager.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	117 src/settings-dialog.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	118 src/symbol-information.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	119 src/terminal-dockwidget.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	120 src/welcome-wizard.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	121 src/workspace-model.cc \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	122 src/workspace-view.cc
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	123
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	124 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	125
15391 1ddf5772fb1a fix broken libgui build John W. Eaton <jwe@octave.org> parents: 15363 diff changeset	126 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	127 $(AM_CPPFLAGS) \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	128 @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	129 @QT_CPPFLAGS@ \
15363 482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	130 -I$(srcdir)/qterminal/libqterminal \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	131 -Isrc -I$(srcdir)/src \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	132 -I$(srcdir)/src/m-editor \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	133 -I$(srcdir)/src/octave-adapter \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	134 -I$(srcdir)/src/qtinfo \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	135 -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	136 -I$(top_srcdir)/liboctave/array \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	137 -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	138 -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	139 -I$(top_srcdir)/liboctave/system \
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	140 -I$(top_srcdir)/liboctave/util \
15404 f52a62a6db3a eliminate copy and paste copyright info in GUI about info box John W. Eaton <jwe@octave.org> parents: 15402 diff changeset	141 -I$(top_builddir)/libinterp -I$(top_srcdir)/libinterp \
15363 482d92904aa4 don't use WARN_CXXFLAGS for qterminal library John W. Eaton <jwe@octave.org> parents: 15362 diff changeset	142 -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	143 -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	144 -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	145 -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	146
15391 1ddf5772fb1a fix broken libgui build John W. Eaton <jwe@octave.org> parents: 15363 diff changeset	147 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	148
15391 1ddf5772fb1a fix broken libgui build John W. Eaton <jwe@octave.org> parents: 15363 diff changeset	149 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	150
15362 48cb1a5bb64d reorganize libgui build John W. Eaton <jwe@octave.org> parents: diff changeset	151 noinst_LTLIBRARIES += src/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	152
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	153 CLEANFILES += \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	154 $(octave_gui_MOC) \
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	155 $(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	156 $(octave_gui_RC)
c7fd43f5a89d build: Re-arrange libgui Makefile.am to follow same ordering as liboctave. Rik <rik@octave.org> parents: 15391 diff changeset	157

Mercurial > hg > octave-lyh

annotate libgui/src/module.mk @ 15596:5f031158c693