Mercurial > octave-nkf
annotate libgui/qterminal-module.mk @ 18840:4a4edf0f2077 nkf-ready
fix LLVM 3.4 build (bug #41061)
* configure.ac: Call new functions OCTAVE_LLVM_RAW_FD_OSTREAM_API and
OCTAVE_LLVM_LEGACY_PASSMANAGER_API, check for Verifier.h header file
* m4/acinclude.m4 (OCTAVE_LLVM_RAW_FD_OSTREAM_API): New function to
detect correct raw_fd_ostream API
* m4/acinclude.m4 (OCTAVE_LLVM_LEGACY_PASSMANAGER_API): New function
to detect legacy passmanager API
* libinterp/corefcn/jit-util.h: Use legacy passmanager namespace if
necessary
* libinterp/corefcn/pt-jit.h (class tree_jit): Use legacy passmanager
class if necessary
* libinterp/corefcn/pt-jit.cc: Include appropriate header files
* libinterp/corefcn/pt-jit.cc (tree_jit::initialize): Use legacy
passmanager if necessary
* libinterp/corefcn/pt-jit.cc (tree_jit::optimize): Use correct API
* libinterp/corefcn/jit-typeinfo.cc: Include appropriate header file
author | Stefan Mahr <dac922@gmx.de> |
---|---|
date | Sun, 11 May 2014 02:28:33 +0200 |
parents | ba808cd9d86c |
children | 4c3c3cf9ef58 |
rev | line source |
---|---|
15362 | 1 EXTRA_DIST += \ |
2 qterminal-module.mk | |
3 | |
4 noinst_HEADERS += \ | |
5 qterminal/libqterminal/QTerminal.h \ | |
6 qterminal/libqterminal/win32/QTerminalColors.h \ | |
7 qterminal/libqterminal/win32/QWinTerminalImpl.h \ | |
8 qterminal/libqterminal/unix/BlockArray.h \ | |
9 qterminal/libqterminal/unix/Character.h \ | |
10 qterminal/libqterminal/unix/CharacterColor.h \ | |
11 qterminal/libqterminal/unix/Emulation.h \ | |
12 qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \ | |
13 qterminal/libqterminal/unix/Filter.h \ | |
14 qterminal/libqterminal/unix/History.h \ | |
15 qterminal/libqterminal/unix/KeyboardTranslator.h \ | |
16 qterminal/libqterminal/unix/konsole_wcwidth.h \ | |
17 qterminal/libqterminal/unix/kpty.h \ | |
18 qterminal/libqterminal/unix/kpty_p.h \ | |
19 qterminal/libqterminal/unix/LineFont.h \ | |
20 qterminal/libqterminal/unix/QUnixTerminalImpl.h \ | |
21 qterminal/libqterminal/unix/Screen.h \ | |
22 qterminal/libqterminal/unix/ScreenWindow.h \ | |
23 qterminal/libqterminal/unix/TerminalCharacterDecoder.h \ | |
24 qterminal/libqterminal/unix/Vt102Emulation.h \ | |
25 qterminal/libqterminal/unix/SelfListener.h \ | |
26 qterminal/libqterminal/unix/TerminalModel.h \ | |
27 qterminal/libqterminal/unix/TerminalView.h | |
28 | |
29 qterminal_libqterminal_la_MOC = \ | |
16639
ba808cd9d86c
simplify QTerminal inheritance scheme
John W. Eaton <jwe@octave.org>
parents:
16413
diff
changeset
|
30 qterminal/libqterminal/moc-QTerminal.cc |
15362 | 31 |
32 nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC) | |
33 | |
34 qterminal_libqterminal_la_CPPFLAGS = \ | |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
35 $(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
|
36 @QT_CPPFLAGS@ \ |
15362 | 37 -I$(srcdir)/qterminal/libqterminal |
38 | |
15363
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
39 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
|
40 |
482d92904aa4
don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents:
15362
diff
changeset
|
41 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
|
42 |
15362 | 43 if WIN32_TERMINAL |
44 | |
45 qterminal_libqterminal_la_SOURCES = \ | |
46 qterminal/libqterminal/win32/QTerminalColors.cpp \ | |
16413
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
47 qterminal/libqterminal/win32/QWinTerminalImpl.cpp \ |
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
48 qterminal/libqterminal/QTerminal.cc |
15362 | 49 |
15392
c7fd43f5a89d
build: Re-arrange libgui Makefile.am to follow same ordering as liboctave.
Rik <rik@octave.org>
parents:
15363
diff
changeset
|
50 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
|
51 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
|
52 |
15362 | 53 qterminal_libqterminal_la_CPPFLAGS += -DUNICODE |
54 | |
55 # 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
|
56 MOC_CPPFLAGS += -DQ_OS_WIN32 |
15362 | 57 |
58 else | |
59 | |
60 qterminal_libqterminal_la_SOURCES = \ | |
61 qterminal/libqterminal/unix/BlockArray.cpp \ | |
62 qterminal/libqterminal/unix/Emulation.cpp \ | |
63 qterminal/libqterminal/unix/Filter.cpp \ | |
64 qterminal/libqterminal/unix/History.cpp \ | |
65 qterminal/libqterminal/unix/KeyboardTranslator.cpp \ | |
66 qterminal/libqterminal/unix/konsole_wcwidth.cpp \ | |
67 qterminal/libqterminal/unix/kpty.cpp \ | |
68 qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \ | |
69 qterminal/libqterminal/unix/Screen.cpp \ | |
70 qterminal/libqterminal/unix/ScreenWindow.cpp \ | |
71 qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \ | |
72 qterminal/libqterminal/unix/Vt102Emulation.cpp \ | |
73 qterminal/libqterminal/unix/SelfListener.cpp \ | |
74 qterminal/libqterminal/unix/TerminalModel.cpp \ | |
16413
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
75 qterminal/libqterminal/unix/TerminalView.cpp \ |
28136851099a
remove _terminal pointer from main_window, it is contained by other Qt object
Daniel J Sebald <daniel.sebald@ieee.org>
parents:
15596
diff
changeset
|
76 qterminal/libqterminal/QTerminal.cc |
15362 | 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) |