Mercurial > octave-dspies
annotate libgui/Makefile.am @ 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 | 5546fe4dd77f |
| children | c7fd43f5a89d |
| rev | line source |
|---|---|
|
15269
b42167e9d805
maint: Update Makefile.am comments to refer to Octave (program) rather than octave (command).
Rik <rik@octave.org>
parents:
15211
diff
changeset
|
1 # Makefile for Octave's libgui directory |
|
b42167e9d805
maint: Update Makefile.am comments to refer to Octave (program) rather than octave (command).
Rik <rik@octave.org>
parents:
15211
diff
changeset
|
2 # |
|
15206
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
3 # Copyright (C) 2012 John W. Eaton |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
4 # |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
5 # This file is part of Octave. |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
6 # |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
7 # Octave is free software; you can redistribute it and/or modify it |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
8 # under the terms of the GNU General Public License as published by the |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
9 # Free Software Foundation; either version 3 of the License, or (at |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
10 # your option) any later version. |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
11 # |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
12 # Octave is distributed in the hope that it will be useful, but WITHOUT |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
13 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
14 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
15 # for more details. |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
16 # |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
17 # You should have received a copy of the GNU General Public License |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
18 # along with Octave; see the file COPYING. If not, see |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
19 # <http://www.gnu.org/licenses/>. |
|
38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
15199
diff
changeset
|
20 |
|
15211
efd2024c7d56
fix installation of default-qt-settings file (bug #37161)
John W. Eaton <jwe@octave.org>
parents:
15206
diff
changeset
|
21 include $(top_srcdir)/build-aux/common.mk |
|
efd2024c7d56
fix installation of default-qt-settings file (bug #37161)
John W. Eaton <jwe@octave.org>
parents:
15206
diff
changeset
|
22 |
| 15362 | 23 AUTOMAKE_OPTIONS = subdir-objects |
| 24 | |
| 25 QT_INCDIR = @QT_INCDIR@ | |
| 26 | |
| 27 QT_LIBDIR = @QT_LIBDIR@ | |
| 28 | |
| 29 QT_LIBS = -lQtCore -lQtGui -lQtNetwork -lqscintilla2 | |
| 30 | |
| 31 QT_LDFLAGS = -L$(QT_LIBDIR) | |
| 32 | |
| 33 MOC_CPPFLAGS = | |
| 34 | |
| 35 octlib_LTLIBRARIES = liboctgui.la | |
| 36 | |
| 37 EXTRA_DIST = default-qt-settings | |
| 38 | |
| 39 BUILT_SOURCES = | |
| 40 | |
| 41 CLEANFILES = | |
| 42 | |
| 43 noinst_HEADERS = | |
| 44 | |
| 45 noinst_LTLIBRARIES = | |
| 46 | |
| 47 include src/module.mk | |
| 48 include qterminal-module.mk | |
| 49 | |
| 15391 | 50 ## libocgui merely collects of compiled convenience libraries. |
| 51 ## It has no source code itself. | |
| 52 liboctgui_la_SOURCES = | |
| 53 | |
| 15362 | 54 include link-deps.mk |
| 55 | |
|
15386
5546fe4dd77f
force C++ linking for liboctave and liboctgui
John W. Eaton <jwe@octave.org>
parents:
15363
diff
changeset
|
56 # Dummy C++ source to cause C++ linking. |
|
5546fe4dd77f
force C++ linking for liboctave and liboctgui
John W. Eaton <jwe@octave.org>
parents:
15363
diff
changeset
|
57 nodist_EXTRA_liboctgui_la_SOURCES = dummy.cc |
|
5546fe4dd77f
force C++ linking for liboctave and liboctgui
John W. Eaton <jwe@octave.org>
parents:
15363
diff
changeset
|
58 |
| 15362 | 59 liboctgui_la_LIBADD = \ |
| 60 qterminal/libqterminal.la \ | |
| 61 src/libgui-src.la \ | |
| 62 $(top_builddir)/libinterp/liboctinterp.la \ | |
| 63 $(top_builddir)/liboctave/liboctave.la \ | |
| 64 $(LIBOCTGUI_LINK_DEPS) | |
| 65 | |
| 66 # Increment these as needed and according to the rules in the libtool manual: | |
| 67 liboctgui_current = 0 | |
| 68 liboctgui_revision = 0 | |
| 69 liboctgui_age = 0 | |
| 70 | |
| 71 liboctgui_version_info = $(liboctgui_current):$(liboctgui_revision):$(liboctgui_age) | |
| 72 | |
| 73 liboctgui_la_LDFLAGS = \ | |
| 74 -version-info $(liboctgui_version_info) \ | |
| 75 $(NO_UNDEFINED_LDFLAG) \ | |
| 76 -bindir $(bindir) \ | |
| 77 $(LIBOCTGUI_LINK_OPTS) | |
|
15159
098546e95a5e
allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents:
15110
diff
changeset
|
78 |
|
098546e95a5e
allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents:
15110
diff
changeset
|
79 octetc_DATA = default-qt-settings |
|
15199
d0715b430286
fix gui sources missing from dist
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
80 |
| 15362 | 81 moc-%.cc: %.h |
| 82 @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< | |
| 83 | |
| 84 ui-%.h: %.ui | |
| 85 @UIC@ -o $@ $< | |
| 86 | |
| 87 qrc-%.cc: %.qrc | |
| 88 @RCC@ -o $@ $< | |
| 89 |