aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorSami Kerola <kerolasa@iki.fi>2013-05-26 09:30:15 (GMT)
committerSami Kerola <kerolasa@iki.fi>2013-05-26 09:38:11 (GMT)
commit7541054b299bbd61310ab0456cf4f25b7a672de3 (patch)
tree47878d28304cb560a4f31bc98466a9347e8edb6c /src/FbTk
parent82e300c7bac1542f27668a8d7e234b4dd6ea1211 (diff)
downloadfluxbox-7541054b299bbd61310ab0456cf4f25b7a672de3.zip
fluxbox-7541054b299bbd61310ab0456cf4f25b7a672de3.tar.bz2
build-sys: move to non-recursive build
This rather large change will attempts to make 'make' to work better. See excellent paper 'Recursive Make Considered Harmful' by Peter Miller for further explanation why several make files is worse than one for whole project. Note. The tests are build with 'make check' rather than defining TEST. Reference: http://miller.emu.id.au/pmiller/books/rmch/ Reference: http://karelzak.blogspot.co.uk/2013/02/non-recursive-automake.html
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Makefile.am76
-rw-r--r--src/FbTk/Makemodule.am164
2 files changed, 164 insertions, 76 deletions
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
deleted file mode 100644
index 983f923..0000000
--- a/src/FbTk/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
1noinst_LIBRARIES = libFbTk.a
2
3AM_CPPFLAGS=-include $(top_builddir)/config.h
4
5if XFT
6xft_SOURCE = XftFontImp.hh XftFontImp.cc
7endif
8if MULTIBYTE
9xmb_SOURCE= XmbFontImp.hh XmbFontImp.cc
10endif
11if XPM
12xpm_SOURCE= ImageXPM.hh ImageXPM.cc
13endif
14if IMLIB2
15imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
16endif
17
18libFbTk_a_CPPFLAGS = $(FREETYPE2_CFLAGS) $(FRIBIDI_CFLAGS) $(AM_CPPFLAGS)
19
20libFbTk_a_SOURCES = App.hh App.cc \
21 Color.cc Color.hh Command.hh \
22 ColorLUT.cc ColorLUT.hh \
23 Accessor.hh DefaultValue.hh \
24 FileUtil.hh FileUtil.cc \
25 EventHandler.hh EventManager.hh EventManager.cc \
26 FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
27 I18n.cc I18n.hh \
28 CommandParser.hh \
29 RadioMenuItem.hh \
30 ImageControl.hh ImageControl.cc \
31 LogicCommands.hh LogicCommands.cc \
32 MacroCommand.hh MacroCommand.cc \
33 Menu.hh Menu.cc MenuItem.hh MenuItem.cc \
34 BoolMenuItem.hh IntMenuItem.hh \
35 MultiButtonMenuItem.hh MultiButtonMenuItem.cc \
36 MenuTheme.hh MenuTheme.cc NotCopyable.hh \
37 BorderTheme.hh BorderTheme.cc TextTheme.hh TextTheme.cc \
38 RefCount.hh SimpleCommand.hh SignalHandler.cc SignalHandler.hh \
39 TextUtils.hh TextUtils.cc Orientation.hh \
40 Texture.cc Texture.hh TextureRender.hh TextureRender.cc \
41 Shape.hh Shape.cc \
42 Theme.hh Theme.cc ThemeItems.cc Timer.hh Timer.cc \
43 FbTime.cc FbTime.hh \
44 XFontImp.cc XFontImp.hh \
45 Button.hh Button.cc \
46 TextButton.hh TextButton.cc \
47 Container.hh Container.cc \
48 MultLayers.cc MultLayers.hh \
49 Layer.cc Layer.hh LayerItem.cc LayerItem.hh \
50 Resource.hh Resource.cc \
51 StringUtil.hh StringUtil.cc Parser.hh Parser.cc \
52 RegExp.hh RegExp.cc \
53 FbString.hh FbString.cc \
54 AutoReloadHelper.hh AutoReloadHelper.cc \
55 Transparent.hh Transparent.cc \
56 FbPixmap.hh FbPixmap.cc \
57 FbDrawable.hh FbDrawable.cc \
58 XrmDatabaseHelper.hh \
59 Image.hh Image.cc \
60 PixmapWithMask.hh \
61 Compose.hh CompareEqual.hh \
62 TextBox.hh TextBox.cc \
63 GContext.hh GContext.cc \
64 KeyUtil.hh KeyUtil.cc \
65 MenuSeparator.hh MenuSeparator.cc \
66 stringstream.hh \
67 TypeAhead.hh SearchResult.hh SearchResult.cc ITypeAheadable.hh \
68 Select2nd.hh STLUtil.hh \
69 CachedPixmap.hh CachedPixmap.cc \
70 Slot.hh Signal.hh MemFun.hh SelectArg.hh \
71 Util.hh \
72 RelCalcHelper.hh RelCalcHelper.cc \
73 ${xpm_SOURCE} \
74 ${xft_SOURCE} \
75 ${xmb_SOURCE} \
76 $(imlib2_SOURCE)
diff --git a/src/FbTk/Makemodule.am b/src/FbTk/Makemodule.am
new file mode 100644
index 0000000..a5f118f
--- /dev/null
+++ b/src/FbTk/Makemodule.am
@@ -0,0 +1,164 @@
1noinst_LIBRARIES = libFbTk.a
2
3if XFT
4xft_SOURCE = \
5 src/FbTk/XftFontImp.hh \
6 src/FbTk/XftFontImp.cc
7endif
8
9if MULTIBYTE
10xmb_SOURCE = \
11 src/FbTk/XmbFontImp.hh \
12 src/FbTk/XmbFontImp.cc
13endif
14
15if XPM
16xpm_SOURCE = \
17 src/FbTk/ImageXPM.hh \
18 src/FbTk/ImageXPM.cc
19endif
20
21if IMLIB2
22imlib2_SOURCE = \
23 src/FbTk/ImageImlib2.hh \
24 src/FbTk/ImageImlib2.cc
25endif
26
27libFbTk_a_CPPFLAGS = \
28 $(FREETYPE2_CFLAGS) \
29 $(FRIBIDI_CFLAGS) \
30 $(AM_CPPFLAGS) \
31 -I$(src_incdir) \
32 -I$(nls_incdir)
33
34libFbTk_a_SOURCES = \
35 $(imlib2_SOURCE) \
36 ${xft_SOURCE} \
37 ${xmb_SOURCE} \
38 ${xpm_SOURCE} \
39 src/FbTk/Accessor.hh \
40 src/FbTk/App.cc \
41 src/FbTk/App.hh \
42 src/FbTk/AutoReloadHelper.cc \
43 src/FbTk/AutoReloadHelper.hh \
44 src/FbTk/BoolMenuItem.hh \
45 src/FbTk/BorderTheme.cc \
46 src/FbTk/BorderTheme.hh \
47 src/FbTk/Button.cc \
48 src/FbTk/Button.hh \
49 src/FbTk/CachedPixmap.cc \
50 src/FbTk/CachedPixmap.hh \
51 src/FbTk/Color.cc \
52 src/FbTk/Color.hh \
53 src/FbTk/ColorLUT.cc \
54 src/FbTk/ColorLUT.hh \
55 src/FbTk/Command.hh \
56 src/FbTk/CommandParser.hh \
57 src/FbTk/CompareEqual.hh \
58 src/FbTk/Compose.hh \
59 src/FbTk/Container.cc \
60 src/FbTk/Container.hh \
61 src/FbTk/DefaultValue.hh \
62 src/FbTk/EventHandler.hh \
63 src/FbTk/EventManager.cc \
64 src/FbTk/EventManager.hh \
65 src/FbTk/FbDrawable.cc \
66 src/FbTk/FbDrawable.hh \
67 src/FbTk/FbPixmap.cc \
68 src/FbTk/FbPixmap.hh \
69 src/FbTk/FbString.cc \
70 src/FbTk/FbString.hh \
71 src/FbTk/FbTime.cc \
72 src/FbTk/FbTime.hh \
73 src/FbTk/FbWindow.cc \
74 src/FbTk/FbWindow.hh \
75 src/FbTk/FileUtil.cc \
76 src/FbTk/FileUtil.hh \
77 src/FbTk/Font.cc \
78 src/FbTk/Font.hh \
79 src/FbTk/FontImp.hh \
80 src/FbTk/GContext.cc \
81 src/FbTk/GContext.hh \
82 src/FbTk/I18n.cc \
83 src/FbTk/I18n.hh \
84 src/FbTk/ITypeAheadable.hh \
85 src/FbTk/Image.cc \
86 src/FbTk/Image.hh \
87 src/FbTk/ImageControl.cc \
88 src/FbTk/ImageControl.hh \
89 src/FbTk/IntMenuItem.hh \
90 src/FbTk/KeyUtil.cc \
91 src/FbTk/KeyUtil.hh \
92 src/FbTk/Layer.cc \
93 src/FbTk/Layer.hh \
94 src/FbTk/LayerItem.cc \
95 src/FbTk/LayerItem.hh \
96 src/FbTk/LogicCommands.cc \
97 src/FbTk/LogicCommands.hh \
98 src/FbTk/MacroCommand.cc \
99 src/FbTk/MacroCommand.hh \
100 src/FbTk/MemFun.hh \
101 src/FbTk/Menu.cc \
102 src/FbTk/Menu.hh \
103 src/FbTk/MenuItem.cc \
104 src/FbTk/MenuItem.hh \
105 src/FbTk/MenuSeparator.cc \
106 src/FbTk/MenuSeparator.hh \
107 src/FbTk/MenuTheme.cc \
108 src/FbTk/MenuTheme.hh \
109 src/FbTk/MultLayers.cc \
110 src/FbTk/MultLayers.hh \
111 src/FbTk/MultiButtonMenuItem.cc \
112 src/FbTk/MultiButtonMenuItem.hh \
113 src/FbTk/NotCopyable.hh \
114 src/FbTk/Orientation.hh \
115 src/FbTk/Parser.cc \
116 src/FbTk/Parser.hh \
117 src/FbTk/PixmapWithMask.hh \
118 src/FbTk/RadioMenuItem.hh \
119 src/FbTk/RefCount.hh \
120 src/FbTk/RegExp.cc \
121 src/FbTk/RegExp.hh \
122 src/FbTk/RelCalcHelper.cc \
123 src/FbTk/RelCalcHelper.hh \
124 src/FbTk/Resource.cc \
125 src/FbTk/Resource.hh \
126 src/FbTk/STLUtil.hh \
127 src/FbTk/SearchResult.cc \
128 src/FbTk/SearchResult.hh \
129 src/FbTk/Select2nd.hh \
130 src/FbTk/SelectArg.hh \
131 src/FbTk/Shape.cc \
132 src/FbTk/Shape.hh \
133 src/FbTk/Signal.hh \
134 src/FbTk/SignalHandler.cc \
135 src/FbTk/SignalHandler.hh \
136 src/FbTk/SimpleCommand.hh \
137 src/FbTk/Slot.hh \
138 src/FbTk/StringUtil.cc \
139 src/FbTk/StringUtil.hh \
140 src/FbTk/TextBox.cc \
141 src/FbTk/TextBox.hh \
142 src/FbTk/TextButton.cc \
143 src/FbTk/TextButton.hh \
144 src/FbTk/TextTheme.cc \
145 src/FbTk/TextTheme.hh \
146 src/FbTk/TextUtils.cc \
147 src/FbTk/TextUtils.hh \
148 src/FbTk/Texture.cc \
149 src/FbTk/Texture.hh \
150 src/FbTk/TextureRender.cc \
151 src/FbTk/TextureRender.hh \
152 src/FbTk/Theme.cc \
153 src/FbTk/Theme.hh \
154 src/FbTk/ThemeItems.cc \
155 src/FbTk/Timer.cc \
156 src/FbTk/Timer.hh \
157 src/FbTk/Transparent.cc \
158 src/FbTk/Transparent.hh \
159 src/FbTk/TypeAhead.hh \
160 src/FbTk/Util.hh \
161 src/FbTk/XFontImp.cc \
162 src/FbTk/XFontImp.hh \
163 src/FbTk/XrmDatabaseHelper.hh \
164 src/FbTk/stringstream.hh
generated by cgit v0.11.2 at 2024-11-24 02:32:40 (GMT)