Mercurial > hg > octave-lyh
diff libgui/src/module.mk @ 15363:482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
* common.mk (AM_CFLAGS): Don't include $(CONFIGURE_CFLAGS) or
$(WARN_CFLAGS) in the list.
(AM_CXXFLAGS): Don't include $(CONFIGURE_CXXFLAGS) or
$(WARN_CXXFLAGS) in the list.
(BUG_CFLAGS, BUG_CXXFLAGS, CONFIGURE_CFLAGS, CONFIGURE_CXXFLAGS):
Delete unused variables.
* libgui/Makefile.am (liboctgui_la_CPPFLAGS): Delete.
* libgui/qterminal-module.mk (qterminal_libqterminal_la_CPPFLAGS):
Include $(AM_CPPFLAGS) in the list.
(qterminal_libqterminal_la_CFLAGS,
qterminal_libqterminal_la_CXXFLAGS): New variables.
* libgui/src/module.mk (liboctgui_la_CPPFLAGS, liboctgui_la_CFLAGS,
liboctgui_la_CXXFLAGS): New variables.
* liboctave/Makefile.am, src/Makefile.am, libinterp/Makefile.am
(AM_CFLAGS): Append $(WARN_CFLAGS).
(AM_CXXFLAGS): Append $(WARN_CXXFLAGS).
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 12 Sep 2012 16:18:48 -0400 |
| parents | 48cb1a5bb64d |
| children | 1ddf5772fb1a |
line wrap: on
line diff
--- a/libgui/src/module.mk +++ b/libgui/src/module.mk @@ -131,6 +131,34 @@ src/icons/zoom-in.png \ src/icons/zoom-out.png +liboctgui_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + @OCTGUI_DLL_DEFS@ \ + -I$(QT_INCDIR) \ + -I$(QT_INCDIR)/QtCore \ + -I$(QT_INCDIR)/QtGui \ + -I$(QT_INCDIR)/QtNetwork \ + -I$(srcdir)/qterminal/libqterminal \ + -Isrc -I$(srcdir)/src \ + -I$(srcdir)/src/m-editor \ + -I$(srcdir)/src/octave-adapter \ + -I$(srcdir)/src/qtinfo \ + -I$(top_srcdir)/liboctave/cruft/misc \ + -I$(top_srcdir)/liboctave/array \ + -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ + -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ + -I$(top_srcdir)/liboctave/system \ + -I$(top_srcdir)/liboctave/util \ + -I$(top_srcdir)/libinterp \ + -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ + -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ + -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ + -I$(top_srcdir)/libinterp/octave-value + +liboctgui_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) + +liboctgui_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) + noinst_LTLIBRARIES += src/libgui-src.la src_libgui_src_la_SOURCES = $(GUI_SRC_SRC)