Mercurial > octave-nkf

comparison libgui/Makefile.am @ 18498:2e7cad6f180c gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial integration of QtHandles. * configure.ac: Check for QtOpenGL module. * libgui/Makefile.am: Include libgui/graphics/module.mk. (liboctgui_la_LIBADD): Include graphics/libgui-graphics.la in the list. (rcc-command): Pass "-name DIR" to rcc command. * main-window.cc (main_window::construct): Install qt functions and register qt toolkit. * libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Include $(FONTCONFIG_CPPFLAGS) and -I$(srcdir)/graphics in the list. * graphics.cc (gtk_manager::gtk_manager): Make qt the default toolkit if it is available. * libgui/graphics/Backend.cc, libgui/graphics/Backend.h, libgui/graphics/BaseControl.cc, libgui/graphics/BaseControl.h, libgui/graphics/ButtonControl.cc, libgui/graphics/ButtonControl.h, libgui/graphics/Canvas.cc, libgui/graphics/Canvas.h, libgui/graphics/CheckBoxControl.cc, libgui/graphics/CheckBoxControl.h, libgui/graphics/Container.cc, libgui/graphics/Container.h, libgui/graphics/ContextMenu.cc, libgui/graphics/ContextMenu.h, libgui/graphics/EditControl.cc, libgui/graphics/EditControl.h, libgui/graphics/Figure.cc, libgui/graphics/Figure.h, libgui/graphics/FigureWindow.cc, libgui/graphics/FigureWindow.h, libgui/graphics/GLCanvas.cc, libgui/graphics/GLCanvas.h, , libgui/graphics/GenericEventNotify.h, libgui/graphics/KeyMap.cc, libgui/graphics/KeyMap.h, libgui/graphics/ListBoxControl.cc, libgui/graphics/ListBoxControl.h, libgui/graphics/Logger.cc, libgui/graphics/Logger.h, libgui/graphics/Menu.cc, libgui/graphics/Menu.h, libgui/graphics/MenuContainer.h, libgui/graphics/MouseModeActionGroup.cc, libgui/graphics/MouseModeActionGroup.h, libgui/graphics/Object.cc, libgui/graphics/Object.h, libgui/graphics/ObjectFactory.cc, libgui/graphics/ObjectFactory.h, libgui/graphics/ObjectProxy.cc, libgui/graphics/ObjectProxy.h, libgui/graphics/Panel.cc, libgui/graphics/Panel.h, libgui/graphics/PopupMenuControl.cc, libgui/graphics/PopupMenuControl.h, libgui/graphics/PushButtonControl.cc, libgui/graphics/PushButtonControl.h, libgui/graphics/PushTool.cc, libgui/graphics/PushTool.h, libgui/graphics/RadioButtonControl.cc, libgui/graphics/RadioButtonControl.h, libgui/graphics/SliderControl.cc, libgui/graphics/SliderControl.h, libgui/graphics/TextControl.cc, libgui/graphics/TextControl.h, libgui/graphics/TextEdit.cc, libgui/graphics/TextEdit.h, libgui/graphics/ToggleButtonControl.cc, libgui/graphics/ToggleButtonControl.h, libgui/graphics/ToggleTool.cc, libgui/graphics/ToggleTool.h, libgui/graphics/ToolBar.cc, libgui/graphics/ToolBar.h, libgui/graphics/ToolBarButton.cc, libgui/graphics/ToolBarButton.h, libgui/graphics/Utils.cc, libgui/graphics/Utils.h, libgui/graphics/__init_qt__.cc, libgui/graphics/__init_qt__.h, libgui/graphics/gl-select.cc, libgui/graphics/gl-select.h, libgui/graphics/images/README, libgui/graphics/images/pan.png, libgui/graphics/images/rotate.png, libgui/graphics/images/select.png, libgui/graphics/images/zoom.png, libgui/graphics/module.mk, libgui/graphics/qthandles.qrc: New files.
author John W. Eaton <jwe@octave.org>
date Thu, 20 Feb 2014 14:05:45 -0500
parents 96c76878c7c6
children f1b91e3137b9
comparison
equal deleted inserted replaced
18495:1ec884e5ff00 18498:2e7cad6f180c
46 noinst_HEADERS = 46 noinst_HEADERS =
47 47
48 noinst_LTLIBRARIES = 48 noinst_LTLIBRARIES =
49 49
50 include src/module.mk 50 include src/module.mk
51 include graphics/module.mk
51 include qterminal-module.mk 52 include qterminal-module.mk
52 53
53 ## liboctgui merely collects a bunch of compiled convenience libraries. 54 ## liboctgui merely collects a bunch of compiled convenience libraries.
54 ## It has no source code itself. 55 ## It has no source code itself.
55 liboctgui_la_SOURCES = 56 liboctgui_la_SOURCES =
60 nodist_EXTRA_liboctgui_la_SOURCES = dummy.cc 61 nodist_EXTRA_liboctgui_la_SOURCES = dummy.cc
61 62
62 liboctgui_la_LIBADD = \ 63 liboctgui_la_LIBADD = \
63 qterminal/libqterminal.la \ 64 qterminal/libqterminal.la \
64 src/libgui-src.la \ 65 src/libgui-src.la \
66 graphics/libgui-graphics.la \
65 $(top_builddir)/libinterp/liboctinterp.la \ 67 $(top_builddir)/libinterp/liboctinterp.la \
66 $(top_builddir)/liboctave/liboctave.la \ 68 $(top_builddir)/liboctave/liboctave.la \
67 $(LIBOCTGUI_LINK_DEPS) 69 $(LIBOCTGUI_LINK_DEPS)
68 70
69 # Increment these as needed and according to the rules in the libtool manual: 71 # Increment these as needed and according to the rules in the libtool manual:
96 98
97 define rcc-command 99 define rcc-command
98 ( echo '#ifdef HAVE_CONFIG_H'; \ 100 ( echo '#ifdef HAVE_CONFIG_H'; \
99 echo '#include <config.h>'; \ 101 echo '#include <config.h>'; \
100 echo '#endif'; \ 102 echo '#endif'; \
101 $(RCC) $< ) > $@-t 103 $(RCC) -name $(@D) $< ) > $@-t
102 mv $@-t $@ 104 mv $@-t $@
103 endef 105 endef
104 106
105 moc-%.cc: %.h 107 moc-%.cc: %.h
106 $(moc-command) 108 $(moc-command)