Mercurial > octave-nkf

comparison gui/src/Makefile.am @ 15117:3735a0e783cb gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more tweaks for the gui build * configure.ac (HAVE_QT, GUIDIR): New variables. Don't run qmake unless it is found. Don't check for moc, uic, or rcc unless qmake is available. List Qt headers and libraries in summary message. * Makefile.am (SUBDIRS): Add @GUIDIR@ to the list. * common.mk (do_subst_config_vals): Substitute OCTAVE_CONF_QT_INCDIR and OCTAVE_CONF_QT_LIBDIR. * gui/src/Makefile.am: Simplify pattern rule for moc files. (octave_gui_CPPFLAGS): = Include -I@QT_INCDIR@ in the list. (octave_gui_LDADD): Include ../../liboctave/liboctave.la and ../../libcruft/libcruft.la in the list. (libqterminal_la_CPPFLAGS): Include -I@QT_INCDIR@ in the list. * toplev.cc (octave_config_info): New struct fields, QT_INCDIR and QT_LIBDIR. * oct-conf.in.h (OCTAVE_CONF_QT_INCDIR, OCTAVE_CONF_QT_LIBDIR): New macros.
author John W. Eaton <jwe@octave.org>
date Sun, 05 Aug 2012 16:43:55 -0400
parents 3d7a7ae53bbf
children bfc220d1de67
comparison
equal deleted inserted replaced
15116:3d7a7ae53bbf 15117:3735a0e783cb
1 define MOC_template =
2 $(1)/moc_%.cpp: $(1)/%.h
3 test -d $(1) || mkdir -p $(1)
4 @MOC@ -o$$@ $$(DEFS) $$(DEFAULT_INCLUDES) $$(INCLUDES) $$(AM_CPPFLAGS) $$(CPPFLAGS) $$(octave_gui_CPPFLAGS) $$<
5 endef
6
7 SRCDIRS = m-editor qtinfo octave-adapter \ 1 SRCDIRS = m-editor qtinfo octave-adapter \
8 ../qterminal/libqterminal/unix ../qterminal/libqterminal/win32 ../qterminal/libqterminal ../qterminal 2 ../qterminal/libqterminal/unix ../qterminal/libqterminal/win32 ../qterminal/libqterminal ../qterminal
9 $(foreach dir,. $(SRCDIRS),$(eval $(call MOC_template,$(dir)))) 3
4 moc_%.cpp: %.h
5 test -d $(@D) || mkdir -p $(@D)
6 @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(octave_gui_CPPFLAGS) $<
10 7
11 ui_%.h: %.ui 8 ui_%.h: %.ui
12 @UIC@ -o $@ $< 9 @UIC@ -o $@ $<
13 10
14 qrc_%.cpp: %.qrc 11 qrc_%.cpp: %.qrc
63 octave-adapter/octave-main-thread.cc \ 60 octave-adapter/octave-main-thread.cc \
64 qtinfo/parser.cc \ 61 qtinfo/parser.cc \
65 qtinfo/webinfo.cc 62 qtinfo/webinfo.cc
66 nodist_octave_gui_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) 63 nodist_octave_gui_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
67 64
68 octave_gui_CPPFLAGS = -I@QT_INCDIR@/QtCore \ 65 octave_gui_CPPFLAGS = -I@QT_INCDIR@ \
66 -I@QT_INCDIR@/QtCore \
69 -I@QT_INCDIR@/QtGui \ 67 -I@QT_INCDIR@/QtGui \
70 -I@QT_INCDIR@/QtNetwork \ 68 -I@QT_INCDIR@/QtNetwork \
71 -I$(srcdir)/../qterminal/libqterminal \ 69 -I$(srcdir)/../qterminal/libqterminal \
72 -I$(srcdir)/m-editor \ 70 -I$(srcdir)/m-editor \
73 -I$(srcdir)/octave-adapter \ 71 -I$(srcdir)/octave-adapter \
82 -I$(srcdir)/../../src/octave-value \ 80 -I$(srcdir)/../../src/octave-value \
83 -I$(srcdir)/../../src/operators \ 81 -I$(srcdir)/../../src/operators \
84 -I$(srcdir)/../../src/parse-tree 82 -I$(srcdir)/../../src/parse-tree
85 83
86 octave_gui_LDADD = libqterminal.la \ 84 octave_gui_LDADD = libqterminal.la \
87 ../../src/liboctinterp.la 85 ../../src/liboctinterp.la \
86 ../../liboctave/liboctave.la \
87 ../../libcruft/libcruft.la
88
88 octave_gui_LDFLAGS = -L@QT_LIBDIR@ -lQtCore -lQtGui -lQtNetwork -lqscintilla2 89 octave_gui_LDFLAGS = -L@QT_LIBDIR@ -lQtCore -lQtGui -lQtNetwork -lqscintilla2
89 90
90 noinst_HEADERS = \ 91 noinst_HEADERS = \
91 documentation-dockwidget.h \ 92 documentation-dockwidget.h \
92 files-dockwidget.h \ 93 files-dockwidget.h \
150 ../qterminal/libqterminal/unix/SelfListener.h \ 151 ../qterminal/libqterminal/unix/SelfListener.h \
151 ../qterminal/libqterminal/unix/TerminalModel.h \ 152 ../qterminal/libqterminal/unix/TerminalModel.h \
152 ../qterminal/libqterminal/unix/TerminalView.h 153 ../qterminal/libqterminal/unix/TerminalView.h
153 154
154 libqterminal_la_CPPFLAGS = $(DEFS) \ 155 libqterminal_la_CPPFLAGS = $(DEFS) \
156 -I@QT_INCDIR@ \
155 -I@QT_INCDIR@/QtCore \ 157 -I@QT_INCDIR@/QtCore \
156 -I@QT_INCDIR@/QtGui \ 158 -I@QT_INCDIR@/QtGui \
157 -I$(srcdir)/../qterminal/libqterminal 159 -I$(srcdir)/../qterminal/libqterminal
158 160
159 libqterminal_la_MOC = \ 161 libqterminal_la_MOC = \