comparison Makefile.am @ 15117:3735a0e783cb gui

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
66 run-octave.in 66 run-octave.in
67 67
68 include m4/module.mk 68 include m4/module.mk
69 69
70 # Subdirectories in which to run `make all'. 70 # Subdirectories in which to run `make all'.
71 SUBDIRS = libgnu libcruft liboctave src scripts @DOCDIR@ examples test 71 SUBDIRS = libgnu libcruft liboctave src @GUIDIR@ scripts @DOCDIR@ examples test
72 72
73 if OCTAVE_GUI 73 if OCTAVE_GUI
74 SUBDIRS += gui 74 SUBDIRS += gui
75 endif 75 endif
76 76