]>
Commit | Line | Data |
---|---|---|
bafe2fcc JB |
1 | --- ClanLib-2.2.7/Sources/Core/Makefile.am.orig 2010-07-19 09:10:06.000000000 +0200 |
2 | +++ ClanLib-2.2.7/Sources/Core/Makefile.am 2011-03-26 14:43:21.808912129 +0100 | |
3 | @@ -164,7 +164,7 @@ | |
4 | endif | |
5 | ||
6 | # FIXME: Hardcoding these here might not be a good idea | |
3f7dc6a8 | 7 | -libclan23Core_la_LIBADD = @LIBPTHREAD@ |
8 | +libclan23Core_la_LIBADD = @LIBPTHREAD@ -lpthread | |
bafe2fcc | 9 | |
3f7dc6a8 | 10 | libclan23Core_la_LDFLAGS = \ |
bafe2fcc JB |
11 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
12 | --- ClanLib-2.2.7/Sources/Network/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 | |
13 | +++ ClanLib-2.2.7/Sources/Network/Makefile.am 2011-03-26 14:55:17.676908777 +0100 | |
14 | @@ -45,9 +45,10 @@ | |
15 | setupnetwork_unix.cpp | |
16 | endif | |
17 | ||
3f7dc6a8 | 18 | +libclan23Network_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la |
19 | libclan23Network_la_LDFLAGS = \ | |
bafe2fcc JB |
20 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
21 | - $(extra_LIBS_Network) | |
22 | + $(extra_LIBS_clanNetwork) | |
23 | ||
3f7dc6a8 | 24 | libclan23Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network) |
bafe2fcc JB |
25 | |
26 | --- ClanLib-2.2.7/Sources/Sound/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
27 | +++ ClanLib-2.2.7/Sources/Sound/Makefile.am 2011-03-26 14:45:51.348911291 +0100 | |
28 | @@ -55,6 +55,7 @@ | |
29 | SoundProviders/Unix/soundprovider_recorder_oss.h | |
30 | endif | |
31 | ||
3f7dc6a8 | 32 | +libclan23Sound_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la |
33 | libclan23Sound_la_LDFLAGS = \ | |
bafe2fcc JB |
34 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
35 | $(extra_LIBS_clanSound) | |
36 | --- ClanLib-2.2.7/Sources/CSSLayout/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
37 | +++ ClanLib-2.2.7/Sources/CSSLayout/Makefile.am 2011-03-26 14:47:45.184912129 +0100 | |
38 | @@ -380,6 +380,7 @@ | |
39 | precomp.cpp \ | |
40 | precomp.h | |
41 | ||
3f7dc6a8 | 42 | +libclan23CSSLayout_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la |
43 | libclan23CSSLayout_la_LDFLAGS = \ | |
bafe2fcc JB |
44 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
45 | $(extra_LIBS_clanCSSLayout) | |
46 | --- ClanLib-2.2.7/Sources/RegExp/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
47 | +++ ClanLib-2.2.7/Sources/RegExp/Makefile.am 2011-03-26 14:49:19.388910453 +0100 | |
48 | @@ -5,9 +5,10 @@ | |
49 | regexp.cpp \ | |
50 | regexp_match.cpp | |
51 | ||
3f7dc6a8 | 52 | +libclan23RegExp_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la |
53 | libclan23RegExp_la_LDFLAGS = \ | |
bafe2fcc JB |
54 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
55 | - $(extra_LIBS_RegExp) | |
56 | + $(extra_LIBS_clanRegExp) | |
57 | ||
3f7dc6a8 | 58 | libclan23Sound_la_CXXFLAGS=$(RegExp_CXXFLAGS) $(extra_CFLAGS_RegExp) |
bafe2fcc JB |
59 | |
60 | --- ClanLib-2.2.7/Sources/MikMod/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
61 | +++ ClanLib-2.2.7/Sources/MikMod/Makefile.am 2011-03-26 14:51:37.044906262 +0100 | |
62 | @@ -8,11 +8,11 @@ | |
63 | soundprovider_mikmod.cpp \ | |
64 | soundprovider_mikmod_session.cpp | |
65 | ||
3f7dc6a8 | 66 | -libclan23MikMod_la_LIBADD = -lmikmod |
67 | +libclan23MikMod_la_LIBADD = $(top_builddir)/Sources/Sound/libclan23Sound.la $(top_builddir)/Sources/Core/libclan23Core.la -lmikmod | |
bafe2fcc | 68 | |
3f7dc6a8 | 69 | libclan23MikMod_la_LDFLAGS = \ |
bafe2fcc JB |
70 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
71 | - $(extra_LIBS_MikMod) | |
72 | + $(extra_LIBS_clanMikMod) | |
73 | ||
3f7dc6a8 | 74 | libclan23Sound_la_CXXFLAGS=$(MikMod_CXXFLAGS) $(extra_CFLAGS_MikMod) |
bafe2fcc JB |
75 | |
76 | --- ClanLib-2.2.7/Sources/GL1/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 | |
77 | +++ ClanLib-2.2.7/Sources/GL1/Makefile.am 2011-03-26 14:55:25.660907939 +0100 | |
78 | @@ -41,6 +41,7 @@ | |
79 | GLX/gl1_window_provider_glx.cpp \ | |
80 | GLX/gl1_window_provider_glx.h | |
81 | endif | |
3f7dc6a8 | 82 | +libclan23GL1_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la |
83 | libclan23GL1_la_LDFLAGS = \ | |
bafe2fcc JB |
84 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
85 | $(extra_LIBS_clanGL1) | |
86 | --- ClanLib-2.2.7/Sources/GL/Makefile.am.orig 2011-01-27 09:46:22.000000000 +0100 | |
87 | +++ ClanLib-2.2.7/Sources/GL/Makefile.am 2011-03-26 14:57:45.268909615 +0100 | |
88 | @@ -48,6 +48,7 @@ | |
89 | GLX/opengl_window_provider_glx.cpp \ | |
90 | GLX/opengl_window_provider_glx.h | |
91 | endif | |
3f7dc6a8 | 92 | +libclan23GL_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la |
93 | libclan23GL_la_LDFLAGS = \ | |
bafe2fcc JB |
94 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
95 | $(extra_LIBS_clanGL) | |
96 | --- ClanLib-2.2.7/Sources/Vorbis/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
97 | +++ ClanLib-2.2.7/Sources/Vorbis/Makefile.am 2011-03-26 14:59:38.508911291 +0100 | |
98 | @@ -5,11 +5,11 @@ | |
99 | soundprovider_vorbis.cpp \ | |
100 | soundprovider_vorbis_session.cpp | |
101 | ||
3f7dc6a8 | 102 | -libclan23Vorbis_la_LIBADD = -logg -lvorbis |
103 | +libclan23Vorbis_la_LIBADD = $(top_builddir)/Sources/Sound/libclan23Sound.la $(top_builddir)/Sources/Core/libclan23Core.la -logg -lvorbis | |
bafe2fcc | 104 | |
3f7dc6a8 | 105 | libclan23Vorbis_la_LDFLAGS = \ |
bafe2fcc JB |
106 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
107 | - $(extra_LIBS_Vorbis) | |
108 | + $(extra_LIBS_clanVorbis) | |
109 | ||
3f7dc6a8 | 110 | libclan23Sound_la_CXXFLAGS=$(Vorbis_CXXFLAGS) $(extra_CFLAGS_Vorbis) |
bafe2fcc JB |
111 | |
112 | --- ClanLib-2.2.7/Sources/Database/Makefile.am.orig 2010-11-01 09:26:08.000000000 +0100 | |
113 | +++ ClanLib-2.2.7/Sources/Database/Makefile.am 2011-03-26 15:00:40.788912129 +0100 | |
114 | @@ -8,6 +8,7 @@ | |
115 | db_value.cpp \ | |
116 | db_transaction.cpp | |
117 | ||
3f7dc6a8 | 118 | +libclan23Database_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la |
119 | libclan23Database_la_LDFLAGS = \ | |
bafe2fcc JB |
120 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
121 | $(extra_LIBS_clanDatabase) | |
122 | --- ClanLib-2.2.7/Sources/App/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
123 | +++ ClanLib-2.2.7/Sources/App/Makefile.am 2011-03-26 15:01:37.480908777 +0100 | |
124 | @@ -6,6 +6,7 @@ | |
3f7dc6a8 | 125 | libclan23App_la_SOURCES = Unix/clanapp.cpp |
bafe2fcc JB |
126 | endif |
127 | ||
3f7dc6a8 | 128 | +libclan23App_la_LIBADD = $(top_builddir)/Sources/Core/libclan23Core.la |
129 | libclan23App_la_LDFLAGS = \ | |
bafe2fcc JB |
130 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
131 | $(extra_LIBS_clanApp) | |
132 | --- ClanLib-2.2.7/Sources/GUI/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
133 | +++ ClanLib-2.2.7/Sources/GUI/Makefile.am 2011-03-26 15:04:04.180909615 +0100 | |
134 | @@ -112,6 +112,7 @@ | |
135 | gui_theme_default_impl.h \ | |
136 | precomp.h | |
137 | ||
3f7dc6a8 | 138 | +libclan23GUI_la_LIBADD = $(top_builddir)/Sources/CSSLayout/libclan23CSSLayout.la $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la |
139 | libclan23GUI_la_LDFLAGS = \ | |
bafe2fcc JB |
140 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
141 | $(extra_LIBS_clanGUI) | |
142 | --- ClanLib-2.2.7/Sources/Sqlite/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 | |
143 | +++ ClanLib-2.2.7/Sources/Sqlite/Makefile.am 2011-03-26 15:06:37.852907938 +0100 | |
144 | @@ -9,9 +9,10 @@ | |
145 | sqlite_reader_provider.cpp \ | |
146 | sqlite_transaction_provider.cpp | |
147 | ||
20984d90 | 148 | +libclan23Sqlite_la_LIBADD = $(top_builddir)/Sources/Database/libclan23Database.la $(top_builddir)/Sources/Core/libclan23Core.la -lpthread -lsqlite3 |
3f7dc6a8 | 149 | libclan23Sqlite_la_LDFLAGS = \ |
bafe2fcc JB |
150 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
151 | - $(extra_LIBS_Sqlite) | |
152 | + $(extra_LIBS_clanSqlite) | |
153 | ||
3f7dc6a8 | 154 | libclan23Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite) |
bafe2fcc | 155 | |
3f7dc6a8 | 156 | --- ClanLib-2.3.1/Sources/Display/Makefile.am.orig 2011-07-26 11:43:05.000000000 +0200 |
157 | +++ ClanLib-2.3.1/Sources/Display/Makefile.am 2011-08-10 09:48:40.939755410 +0200 | |
bafe2fcc | 158 | @@ -1,6 +1,7 @@ |
3f7dc6a8 | 159 | lib_LTLIBRARIES = libclan23Display.la |
160 | ||
bafe2fcc | 161 | if WIN32 |
3f7dc6a8 | 162 | +libclan23Display_la_LIBADD = |
bafe2fcc | 163 | else |
3f7dc6a8 | 164 | libclan23Display_la_LIBADD = -lpng -ljpeg |
bafe2fcc | 165 | endif |
3f7dc6a8 | 166 | @@ -201,7 +202,7 @@ |
167 | X11/font_config.cpp \ | |
168 | X11/font_config.h | |
bafe2fcc | 169 | endif |
3f7dc6a8 | 170 | - |
171 | +libclan23Display_la_LIBADD += $(top_builddir)/Sources/Core/libclan23Core.la $(clanDisplay_LIBS) | |
172 | libclan23Display_la_LDFLAGS = \ | |
bafe2fcc | 173 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
3f7dc6a8 | 174 | $(extra_LIBS_clanDisplay |
ca6ff180 JB |
175 | --- ClanLib-2.2.7/Sources/SWRender/Makefile.am.orig 2010-07-05 16:50:31.000000000 +0200 |
176 | +++ ClanLib-2.2.7/Sources/SWRender/Makefile.am 2011-03-27 07:33:24.821729730 +0200 | |
177 | @@ -69,9 +69,10 @@ | |
178 | Canvas/Commands/pixel_command_triangle.cpp \ | |
179 | swr_target.cpp | |
180 | ||
3f7dc6a8 | 181 | +libclan23SWRender_la_LIBADD = $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la |
182 | libclan23SWRender_la_LDFLAGS = \ | |
ca6ff180 JB |
183 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ |
184 | - $(extra_LIBS_SWRender) | |
185 | + $(extra_LIBS_clanSWRender) | |
186 | ||
3f7dc6a8 | 187 | libclan23Sound_la_CXXFLAGS=$(SWRender_CXXFLAGS) $(extra_CFLAGS_SWRender) |
ca6ff180 | 188 | |
bafe2fcc JB |
189 | --- ClanLib-2.2.7/configure.ac.orig 2011-01-27 09:46:22.000000000 +0100 |
190 | +++ ClanLib-2.2.7/configure.ac 2011-03-26 15:25:57.540910453 +0100 | |
191 | @@ -631,9 +631,14 @@ | |
192 | dnl Set the include path | |
193 | CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources" | |
194 | ||
195 | +ClanLib_Modules= | |
196 | +ClanLib_pkgconfig= | |
197 | +ClanLib_API_Modules= | |
198 | dnl Modules which will be build | |
199 | -ClanLib_Modules="App" | |
200 | -ClanLib_pkgconfig="clanApp.pc" | |
201 | +CLANLIB_ENABLE_MODULES(Core) | |
202 | + | |
203 | +ClanLib_Modules="$ClanLib_Modules App" | |
204 | +ClanLib_pkgconfig="$ClanLib_pkgconfig clanApp.pc" | |
205 | ||
206 | dnl API header files for the Modules which will be installed | |
207 | ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)" | |
208 | @@ -641,7 +646,6 @@ | |
209 | dnl Default examples which will be build | |
210 | dnl (Currently Disabled) | |
211 | ClanLib_Examples="" | |
212 | -CLANLIB_ENABLE_MODULES(Core) | |
213 | ||
214 | if test "$enable_clanDisplay" = "yes"; then | |
215 | CLANLIB_ENABLE_MODULES(Display) | |
216 | @@ -670,14 +674,14 @@ | |
217 | CLANLIB_ENABLE_MODULES(GL1) | |
218 | fi | |
219 | ||
220 | -if test "$enable_clanGUI" = "yes"; then | |
221 | - CLANLIB_ENABLE_MODULES(GUI) | |
222 | -fi | |
223 | - | |
224 | if test "$enable_clanCSSLayout" = "yes"; then | |
225 | CLANLIB_ENABLE_MODULES(CSSLayout) | |
226 | fi | |
227 | ||
228 | +if test "$enable_clanGUI" = "yes"; then | |
229 | + CLANLIB_ENABLE_MODULES(GUI) | |
230 | +fi | |
231 | + | |
232 | if test "$enable_clanSWRender" = "yes"; then | |
233 | CLANLIB_ENABLE_MODULES(SWRender) | |
234 | fi |