Mercurial > hg > octave-nkf

annotate libgui/qterminal-module.mk @ 15362:48cb1a5bb64d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganize libgui build * configure.ac (AC_CONFIG_FILES): Remove libgui/src/Makefile from the list. * libgui/qterminal-module.mk, libgui/src/module.mk: New files, mostly extracted from libgui/src/Makefile.am. Adjust file names as needed. Build convenience libraries in each subdir. * libgui/Makefile.am: Move the remains of libgui/src/Makefile.am here. Include qterminal-module.mk and src/module.mk. * libgui/src/Makefile.am: Delete. * libgui/link-deps.mk: Rename from libgui/src/link-deps.mk. * src/Makefile.am: Include ../libgui/link-deps.mk instead of ../libgui/src/link-deps.mk. (OCTAVE_GUI_LIBS): Use $(top_builddir)/libgui/liboctgui.la instead of $(top_builddir)/libgui/src/liboctgui.la.
author John W. Eaton <jwe@octave.org>
date Wed, 12 Sep 2012 15:08:45 -0400
parents
children 482d92904aa4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15362
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 EXTRA_DIST += \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 qterminal-module.mk
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 noinst_HEADERS += \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 qterminal/libqterminal/QTerminal.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 qterminal/libqterminal/QTerminalInterface.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 qterminal/libqterminal/win32/QTerminalColors.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 qterminal/libqterminal/win32/QWinTerminalImpl.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 qterminal/libqterminal/unix/BlockArray.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 qterminal/libqterminal/unix/Character.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 qterminal/libqterminal/unix/CharacterColor.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 qterminal/libqterminal/unix/Emulation.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 qterminal/libqterminal/unix/Filter.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 qterminal/libqterminal/unix/History.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 qterminal/libqterminal/unix/KeyboardTranslator.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 qterminal/libqterminal/unix/konsole_wcwidth.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 qterminal/libqterminal/unix/kpty.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 qterminal/libqterminal/unix/kpty_p.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 qterminal/libqterminal/unix/LineFont.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 qterminal/libqterminal/unix/QUnixTerminalImpl.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 qterminal/libqterminal/unix/Screen.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 qterminal/libqterminal/unix/ScreenWindow.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 qterminal/libqterminal/unix/TerminalCharacterDecoder.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 qterminal/libqterminal/unix/Vt102Emulation.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 qterminal/libqterminal/unix/SelfListener.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 qterminal/libqterminal/unix/TerminalModel.h \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 qterminal/libqterminal/unix/TerminalView.h
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 qterminal_libqterminal_la_MOC = \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 qterminal/libqterminal/moc-QTerminal.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 qterminal/libqterminal/moc-QTerminalInterface.cc
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC)
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 qterminal_libqterminal_la_CPPFLAGS = \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37 -I$(QT_INCDIR) \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 -I$(QT_INCDIR)/QtCore \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 -I$(QT_INCDIR)/QtGui \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 -I$(srcdir)/qterminal/libqterminal
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 if WIN32_TERMINAL
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 qterminal_libqterminal_la_SOURCES = \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 qterminal/libqterminal/win32/QTerminalColors.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 qterminal/libqterminal/win32/QWinTerminalImpl.cpp
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 qterminal_libqterminal_la_MOC += qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 qterminal_libqterminal_la_CPPFLAGS += -DUNICODE
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 # This flag is required to let MOC know about Q_OS_WIN32.
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 MOC_CPPFLAGS += -DWIN32
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 else
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 qterminal_libqterminal_la_SOURCES = \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 qterminal/libqterminal/unix/BlockArray.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58 qterminal/libqterminal/unix/Emulation.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 qterminal/libqterminal/unix/Filter.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 qterminal/libqterminal/unix/History.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 qterminal/libqterminal/unix/KeyboardTranslator.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 qterminal/libqterminal/unix/konsole_wcwidth.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 qterminal/libqterminal/unix/kpty.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 qterminal/libqterminal/unix/Screen.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 qterminal/libqterminal/unix/ScreenWindow.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 qterminal/libqterminal/unix/Vt102Emulation.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 qterminal/libqterminal/unix/SelfListener.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70 qterminal/libqterminal/unix/TerminalModel.cpp \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 qterminal/libqterminal/unix/TerminalView.cpp
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73 qterminal_libqterminal_la_MOC += \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 qterminal/libqterminal/unix/moc-Emulation.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 qterminal/libqterminal/unix/moc-Filter.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 qterminal/libqterminal/unix/moc-QUnixTerminalImpl.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77 qterminal/libqterminal/unix/moc-ScreenWindow.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 qterminal/libqterminal/unix/moc-SelfListener.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 qterminal/libqterminal/unix/moc-TerminalModel.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80 qterminal/libqterminal/unix/moc-TerminalView.cc \
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 qterminal/libqterminal/unix/moc-Vt102Emulation.cc
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 endif
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 noinst_LTLIBRARIES += qterminal/libqterminal.la
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86
48cb1a5bb64d reorganize libgui build
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87 CLEANFILES += $(qterminal_libqterminal_la_MOC)