Mercurial > hg > octave-nkf
view .hgignore @ 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 | 95b1c64c287f |
children | 2f2fb099ac3a |
line wrap: on
line source
syntax: regexp # The recurrent (^|/) idiom in the regexps below should be understood # to mean "at any directory" while the ^ idiom means "from the # project's top-level directory". # This one gets created by gnulib during the build, contains no Octave # files. ^gnulib/ # These directories mostly contain cruft during build time, but they # do contain some Octave code. ^libgnu/ ^m4/ # Emacs tools create these (^|/)TAGS$ (^|/)semantic.cache$ (/|^)Makefile\.in$ ^INSTALL$ ^aclocal\.m4 ^build-.*($|/) ^configure$ ^autom4te\.cache($|/) ^config\.h\.in$ # e.g. doc/faq/OctaveFAQ.info # doc/interpreter/octave.info-4 ^doc/.*\.info(-\d)?$ ^doc/\w*/stamp-vti$ ^doc/\w*/version\.texi$ ^doc/interpreter/images\.mk$ # e.g. liboctave/smx-op-inc.mk ^liboctave/[\w-]*\.mk$ ^src/DLD-FUNCTIONS/module\.mk$