Mercurial > octave-antonio
annotate libgui/Makefile.am @ 15596:5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
* build-aux/common.mk (do_subst_config_vals): Replace QT_INCDIR and QT_LIBDIR
with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS.
* configure.ac: Likewise and use pkg-config to discover the new variables.
* libgui/Makefile.am (QT_INCDIR, QT_LIBDIR, QT_LIBS, QT_LDFLAGS): Delete
variable definitions.
* libgui/link-deps.mk (LIBOCTGUI_LINK_DEPS): Use automake @QT_LIBS@.
(LIBOCTGUI_LIK_OPTS): Use automake @QT_LDFLAGS@.
* libgui/qterminal-module.mk (qterminal_libqterminal_la_CPPFLAGS): Use
automake @QT_CPPFLAGS@ instead of QT_INCDIR-based include paths.
(MOC_CPPFLAGS): Define Q_OS_WIN32 instead of WIN32.
* libgui/src/module.mk (src_libgui_src_la_CPPFLAGS): Use automake
@QT_CPPFLAGS@ instead of QT_INCDIR-based include paths.
* libinterp/interpfcn/toplev.cc (Foctave_config_info): Replace QT_INCDIR and
QT_LIBDIR with QT_CPPFLAGS, QT_LDFLAGS and QT_LIBS.
* libinterp/oct-conf.in.h: Replace OCTAVE_CONF_QT_INCDIR and
OCTAVE_CONF_QT_LIBDIR with OCTAVE_CONF_QT_CPPFLAGS, OCTAVE_CONF_QT_LDFLAGS
and OCTAVE_CONF_QT_LIBS.
* m4/acinclude.m4 (OCTAVE_CHECK_FUNC_FINDFIRST_MODERN,
OCTAVE_CHECK_FUNC_SETPLACEHOLDERTEXT): Use QT_CPPFLAGS instead of QT_INCDIR.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Mon, 05 Nov 2012 01:47:49 +0000 |
| parents | c7fd43f5a89d |
| children | e27d9b9b71f4 |
| 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 MOC_CPPFLAGS = | |
| 26 | |
| 27 octlib_LTLIBRARIES = liboctgui.la | |
| 28 | |
| 29 EXTRA_DIST = default-qt-settings | |
| 30 | |
|
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
31 CLEANFILES = |
| 15362 | 32 |
|
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
33 BUILT_SOURCES = |
| 15362 | 34 |
| 35 noinst_HEADERS = | |
| 36 | |
| 37 noinst_LTLIBRARIES = | |
| 38 | |
| 39 include src/module.mk | |
| 40 include qterminal-module.mk | |
| 41 | |
|
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
42 ## liboctgui merely collects a bunch of compiled convenience libraries. |
| 15391 | 43 ## It has no source code itself. |
| 44 liboctgui_la_SOURCES = | |
| 45 | |
| 15362 | 46 include link-deps.mk |
| 47 | |
|
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15391
diff
changeset
|
48 # Dummy C++ source to force C++ linking. |
|
15386
5546fe4dd77f
force C++ linking for liboctave and liboctgui
John W. Eaton <jwe@octave.org>
parents:
15363
diff
changeset
|
49 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
|
50 |
| 15362 | 51 liboctgui_la_LIBADD = \ |
| 52 qterminal/libqterminal.la \ | |
| 53 src/libgui-src.la \ | |
| 54 $(top_builddir)/libinterp/liboctinterp.la \ | |
| 55 $(top_builddir)/liboctave/liboctave.la \ | |
| 56 $(LIBOCTGUI_LINK_DEPS) | |
| 57 | |
| 58 # Increment these as needed and according to the rules in the libtool manual: | |
| 59 liboctgui_current = 0 | |
| 60 liboctgui_revision = 0 | |
| 61 liboctgui_age = 0 | |
| 62 | |
| 63 liboctgui_version_info = $(liboctgui_current):$(liboctgui_revision):$(liboctgui_age) | |
| 64 | |
| 65 liboctgui_la_LDFLAGS = \ | |
| 66 -version-info $(liboctgui_version_info) \ | |
| 67 $(NO_UNDEFINED_LDFLAG) \ | |
| 68 -bindir $(bindir) \ | |
| 69 $(LIBOCTGUI_LINK_OPTS) | |
|
15159
098546e95a5e
allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents:
15110
diff
changeset
|
70 |
|
098546e95a5e
allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents:
15110
diff
changeset
|
71 octetc_DATA = default-qt-settings |
|
15199
d0715b430286
fix gui sources missing from dist
John W. Eaton <jwe@octave.org>
parents:
15196
diff
changeset
|
72 |
| 15362 | 73 moc-%.cc: %.h |
| 74 @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(MOC_CPPFLAGS) $(liboctgui_la_CPPFLAGS) $< | |
| 75 | |
| 76 ui-%.h: %.ui | |
| 77 @UIC@ -o $@ $< | |
| 78 | |
| 79 qrc-%.cc: %.qrc | |
| 80 @RCC@ -o $@ $< | |
| 81 |