Mercurial > hg > octave-lyh

comparison libgui/src/module.mk @ 15391:1ddf5772fb1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 482d92904aa4
children c7fd43f5a89d
comparison
equal deleted inserted replaced
15390:ad2c3902b826 15391:1ddf5772fb1a
30 30
31 octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI)) 31 octave_gui_UI_H = $(patsubst src/%.ui, src/ui-%.h, $(octave_gui_UI))
32 32
33 octave_gui_RC = src/qrc-resource.cc 33 octave_gui_RC = src/qrc-resource.cc
34 34
35 liboctgui_la_SOURCES = \ 35 src_libgui_src_la_SOURCES = \
36 src/documentation-dockwidget.cc \ 36 src/documentation-dockwidget.cc \
37 src/files-dockwidget.cc \ 37 src/files-dockwidget.cc \
38 src/history-dockwidget.cc \ 38 src/history-dockwidget.cc \
39 src/m-editor/file-editor-tab.cc \ 39 src/m-editor/file-editor-tab.cc \
40 src/m-editor/file-editor.cc \ 40 src/m-editor/file-editor.cc \
54 src/terminal-dockwidget.cc \ 54 src/terminal-dockwidget.cc \
55 src/welcome-wizard.cc \ 55 src/welcome-wizard.cc \
56 src/workspace-model.cc \ 56 src/workspace-model.cc \
57 src/workspace-view.cc 57 src/workspace-view.cc
58 58
59 nodist_liboctgui_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC) 59 nodist_src_libgui_src_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)
60 60
61 noinst_HEADERS += \ 61 noinst_HEADERS += \
62 src/documentation-dockwidget.h \ 62 src/documentation-dockwidget.h \
63 src/files-dockwidget.h \ 63 src/files-dockwidget.h \
64 src/history-dockwidget.h \ 64 src/history-dockwidget.h \
129 src/icons/undo.png \ 129 src/icons/undo.png \
130 src/icons/up.png \ 130 src/icons/up.png \
131 src/icons/zoom-in.png \ 131 src/icons/zoom-in.png \
132 src/icons/zoom-out.png 132 src/icons/zoom-out.png
133 133
134 liboctgui_la_CPPFLAGS = \ 134 src_libgui_src_la_CPPFLAGS = \
135 $(AM_CPPFLAGS) \ 135 $(AM_CPPFLAGS) \
136 @OCTGUI_DLL_DEFS@ \ 136 @OCTGUI_DLL_DEFS@ \
137 -I$(QT_INCDIR) \ 137 -I$(QT_INCDIR) \
138 -I$(QT_INCDIR)/QtCore \ 138 -I$(QT_INCDIR)/QtCore \
139 -I$(QT_INCDIR)/QtGui \ 139 -I$(QT_INCDIR)/QtGui \
153 -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \ 153 -I$(top_builddir)/libinterp/parse-tree -I$(top_srcdir)/libinterp/parse-tree \
154 -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \ 154 -I$(top_builddir)/libinterp/interp-core -I$(top_srcdir)/libinterp/interp-core \
155 -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ 155 -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \
156 -I$(top_srcdir)/libinterp/octave-value 156 -I$(top_srcdir)/libinterp/octave-value
157 157
158 liboctgui_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) 158 src_libgui_src_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
159 159
160 liboctgui_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) 160 src_libgui_src_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
161 161
162 noinst_LTLIBRARIES += src/libgui-src.la 162 noinst_LTLIBRARIES += src/libgui-src.la
163
164 src_libgui_src_la_SOURCES = $(GUI_SRC_SRC)
165 src_libgui_src_la_CPPFLAGS = $(liboctgui_la_CPPFLAGS)