Mercurial > hg > octave-shane
changeset 15391:1ddf5772fb1a
fix broken libgui build
* libgui/Makefile.am (liboctgui_la_SOURCES): New variable.
* libgui/src/module.mk (src_libgui_src_la_SOURCES): Rename from
liboctgui_la_SOURCES.
(nodist_src_libgui_src_la_SOURCES): Rename from
nodist_liboctgui_la_SOURCES.
(src_libgui_src_la_CPPFLAGS): Rename from liboctgui_la_CPPFLAGS.
(src_libgui_src_la_CFLAGS): Rename from liboctgui_la_CFLAGS.
(src_libgui_src_la_CXXFLAGS): Rename from liboctgui_la_CXXFLAGS.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 14 Sep 2012 22:57:00 -0400 |
parents | ad2c3902b826 |
children | c7fd43f5a89d |
files | libgui/Makefile.am libgui/src/module.mk |
diffstat | 2 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/Makefile.am +++ b/libgui/Makefile.am @@ -47,6 +47,10 @@ include src/module.mk include qterminal-module.mk +## libocgui merely collects of compiled convenience libraries. +## It has no source code itself. +liboctgui_la_SOURCES = + include link-deps.mk # Dummy C++ source to cause C++ linking.
--- a/libgui/src/module.mk +++ b/libgui/src/module.mk @@ -32,7 +32,7 @@ octave_gui_RC = src/qrc-resource.cc -liboctgui_la_SOURCES = \ +src_libgui_src_la_SOURCES = \ src/documentation-dockwidget.cc \ src/files-dockwidget.cc \ src/history-dockwidget.cc \ @@ -56,7 +56,7 @@ src/workspace-model.cc \ src/workspace-view.cc -nodist_liboctgui_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) +nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) noinst_HEADERS += \ src/documentation-dockwidget.h \ @@ -131,7 +131,7 @@ src/icons/zoom-in.png \ src/icons/zoom-out.png -liboctgui_la_CPPFLAGS = \ +src_libgui_src_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @OCTGUI_DLL_DEFS@ \ -I$(QT_INCDIR) \ @@ -155,11 +155,8 @@ -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ -I$(top_srcdir)/libinterp/octave-value -liboctgui_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) +src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) -liboctgui_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) +src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) noinst_LTLIBRARIES += src/libgui-src.la - -src_libgui_src_la_SOURCES = $(GUI_SRC_SRC) -src_libgui_src_la_CPPFLAGS = $(liboctgui_la_CPPFLAGS)