# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1347677820 14400
# Node ID 1ddf5772fb1a94b446ae177b375a8dab8908bfbe
# Parent  ad2c3902b826b62818e55046fcbac605e7c8d57c
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.

diff -r ad2c3902b826 -r 1ddf5772fb1a libgui/Makefile.am
--- a/libgui/Makefile.am	Fri Sep 14 11:25:57 2012 -0700
+++ b/libgui/Makefile.am	Fri Sep 14 22:57:00 2012 -0400
@@ -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.
diff -r ad2c3902b826 -r 1ddf5772fb1a libgui/src/module.mk
--- a/libgui/src/module.mk	Fri Sep 14 11:25:57 2012 -0700
+++ b/libgui/src/module.mk	Fri Sep 14 22:57:00 2012 -0400
@@ -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)