Mercurial > octave
annotate libgui/qterminal-module.mk @ 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 | 28136851099a |
rev | line source |
---|---|
15362 | 1 EXTRA_DIST += \ |
2 qterminal-module.mk | |
3 | |
4 noinst_HEADERS += \ | |
5 qterminal/libqterminal/QTerminal.h \ | |
6 qterminal/libqterminal/QTerminalInterface.h \ | |
7 qterminal/libqterminal/win32/QTerminalColors.h \ | |
8 qterminal/libqterminal/win32/QWinTerminalImpl.h \ | |
9 qterminal/libqterminal/unix/BlockArray.h \ | |
10 qterminal/libqterminal/unix/Character.h \ | |
11 qterminal/libqterminal/unix/CharacterColor.h \ | |
12 qterminal/libqterminal/unix/Emulation.h \ | |
13 qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \ | |
14 qterminal/libqterminal/unix/Filter.h \ | |
15 qterminal/libqterminal/unix/History.h \ | |
16 qterminal/libqterminal/unix/KeyboardTranslator.h \ | |
17 qterminal/libqterminal/unix/konsole_wcwidth.h \ | |
18 qterminal/libqterminal/unix/kpty.h \ | |
19 qterminal/libqterminal/unix/kpty_p.h \ | |
20 qterminal/libqterminal/unix/LineFont.h \ | |
21 qterminal/libqterminal/unix/QUnixTerminalImpl.h \ | |
22 qterminal/libqterminal/unix/Screen.h \ | |
23 qterminal/libqterminal/unix/ScreenWindow.h \ | |
24 qterminal/libqterminal/unix/TerminalCharacterDecoder.h \ | |
25 qterminal/libqterminal/unix/Vt102Emulation.h \ | |
26 qterminal/libqterminal/unix/SelfListener.h \ | |
27 qterminal/libqterminal/unix/TerminalModel.h \ | |
28 qterminal/libqterminal/unix/TerminalView.h | |
29 | |
30 qterminal_libqterminal_la_MOC = \ | |
31 qterminal/libqterminal/moc-QTerminal.cc \ | |
32 qterminal/libqterminal/moc-QTerminalInterface.cc | |
33 | |
34 nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC) | |
35 | |
36 qterminal_libqterminal_la_CPPFLAGS = \ | |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
37 $(AM_CPPFLAGS) \ |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15392
diff
changeset
|
38 @QT_CPPFLAGS@ \ |
15362 | 39 -I$(srcdir)/qterminal/libqterminal |
40 | |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
41 qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS) |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
42 |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
43 qterminal_libqterminal_la_CXXFLAGS = $(AM_CXXFLAGS) |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
44 |
15362 | 45 if WIN32_TERMINAL |
46 | |
47 qterminal_libqterminal_la_SOURCES = \ | |
48 qterminal/libqterminal/win32/QTerminalColors.cpp \ | |
49 qterminal/libqterminal/win32/QWinTerminalImpl.cpp | |
50 | |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15363
diff
changeset
|
51 qterminal_libqterminal_la_MOC += \ |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15363
diff
changeset
|
52 qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc |
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15363
diff
changeset
|
53 |
15362 | 54 qterminal_libqterminal_la_CPPFLAGS += -DUNICODE |
55 | |
56 # This flag is required to let MOC know about Q_OS_WIN32. | |
15596
5f031158c693
Use pkg-config to discover Qt (pkg-config is already a requirement anyway).
Michael Goffioul <michael.goffioul@gmail.com>
parents:
15392
diff
changeset
|
57 MOC_CPPFLAGS += -DQ_OS_WIN32 |
15362 | 58 |
59 else | |
60 | |
61 qterminal_libqterminal_la_SOURCES = \ | |
62 qterminal/libqterminal/unix/BlockArray.cpp \ | |
63 qterminal/libqterminal/unix/Emulation.cpp \ | |
64 qterminal/libqterminal/unix/Filter.cpp \ | |
65 qterminal/libqterminal/unix/History.cpp \ | |
66 qterminal/libqterminal/unix/KeyboardTranslator.cpp \ | |
67 qterminal/libqterminal/unix/konsole_wcwidth.cpp \ | |
68 qterminal/libqterminal/unix/kpty.cpp \ | |
69 qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \ | |
70 qterminal/libqterminal/unix/Screen.cpp \ | |
71 qterminal/libqterminal/unix/ScreenWindow.cpp \ | |
72 qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \ | |
73 qterminal/libqterminal/unix/Vt102Emulation.cpp \ | |
74 qterminal/libqterminal/unix/SelfListener.cpp \ | |
75 qterminal/libqterminal/unix/TerminalModel.cpp \ | |
76 qterminal/libqterminal/unix/TerminalView.cpp | |
77 | |
78 qterminal_libqterminal_la_MOC += \ | |
79 qterminal/libqterminal/unix/moc-Emulation.cc \ | |
80 qterminal/libqterminal/unix/moc-Filter.cc \ | |
81 qterminal/libqterminal/unix/moc-QUnixTerminalImpl.cc \ | |
82 qterminal/libqterminal/unix/moc-ScreenWindow.cc \ | |
83 qterminal/libqterminal/unix/moc-SelfListener.cc \ | |
84 qterminal/libqterminal/unix/moc-TerminalModel.cc \ | |
85 qterminal/libqterminal/unix/moc-TerminalView.cc \ | |
86 qterminal/libqterminal/unix/moc-Vt102Emulation.cc | |
87 | |
88 endif | |
89 | |
90 noinst_LTLIBRARIES += qterminal/libqterminal.la | |
91 | |
92 CLEANFILES += $(qterminal_libqterminal_la_MOC) |