]>
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 | |
7 | -libclan22Core_la_LIBADD = @LIBPTHREAD@ | |
8 | +libclan22Core_la_LIBADD = @LIBPTHREAD@ -lpthread | |
9 | ||
10 | libclan22Core_la_LDFLAGS = \ | |
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 | ||
18 | +libclan22Network_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la | |
19 | libclan22Network_la_LDFLAGS = \ | |
20 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ | |
21 | - $(extra_LIBS_Network) | |
22 | + $(extra_LIBS_clanNetwork) | |
23 | ||
24 | libclan22Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network) | |
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 | ||
32 | +libclan22Sound_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la | |
33 | libclan22Sound_la_LDFLAGS = \ | |
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 | ||
42 | +libclan22CSSLayout_la_LIBADD = $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la | |
43 | libclan22CSSLayout_la_LDFLAGS = \ | |
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 | ||
52 | +libclan22RegExp_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la | |
53 | libclan22RegExp_la_LDFLAGS = \ | |
54 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ | |
55 | - $(extra_LIBS_RegExp) | |
56 | + $(extra_LIBS_clanRegExp) | |
57 | ||
58 | libclan22Sound_la_CXXFLAGS=$(RegExp_CXXFLAGS) $(extra_CFLAGS_RegExp) | |
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 | ||
66 | -libclan22MikMod_la_LIBADD = -lmikmod | |
67 | +libclan22MikMod_la_LIBADD = $(top_builddir)/Sources/Sound/libclan22Sound.la $(top_builddir)/Sources/Core/libclan22Core.la -lmikmod | |
68 | ||
69 | libclan22MikMod_la_LDFLAGS = \ | |
70 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ | |
71 | - $(extra_LIBS_MikMod) | |
72 | + $(extra_LIBS_clanMikMod) | |
73 | ||
74 | libclan22Sound_la_CXXFLAGS=$(MikMod_CXXFLAGS) $(extra_CFLAGS_MikMod) | |
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 | |
82 | +libclan22GL1_la_LIBADD = $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la | |
83 | libclan22GL1_la_LDFLAGS = \ | |
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 | |
92 | +libclan22GL_la_LIBADD = $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la | |
93 | libclan22GL_la_LDFLAGS = \ | |
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 | ||
102 | -libclan22Vorbis_la_LIBADD = -logg -lvorbis | |
103 | +libclan22Vorbis_la_LIBADD = $(top_builddir)/Sources/Sound/libclan22Sound.la $(top_builddir)/Sources/Core/libclan22Core.la -logg -lvorbis | |
104 | ||
105 | libclan22Vorbis_la_LDFLAGS = \ | |
106 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ | |
107 | - $(extra_LIBS_Vorbis) | |
108 | + $(extra_LIBS_clanVorbis) | |
109 | ||
110 | libclan22Sound_la_CXXFLAGS=$(Vorbis_CXXFLAGS) $(extra_CFLAGS_Vorbis) | |
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 | ||
118 | +libclan22Database_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la | |
119 | libclan22Database_la_LDFLAGS = \ | |
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 @@ | |
125 | libclan22App_la_SOURCES = Unix/clanapp.cpp | |
126 | endif | |
127 | ||
128 | +libclan22App_la_LIBADD = $(top_builddir)/Sources/Core/libclan22Core.la | |
129 | libclan22App_la_LDFLAGS = \ | |
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 | ||
138 | +libclan22GUI_la_LIBADD = $(top_builddir)/Sources/CSSLayout/libclan22CSSLayout.la $(top_builddir)/Sources/Display/libclan22Display.la $(top_builddir)/Sources/Core/libclan22Core.la | |
139 | libclan22GUI_la_LDFLAGS = \ | |
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 | ||
148 | +libclan22Sqlite_la_LIBADD = $(top_builddir)/Sources/Database/libclan22Database.la $(top_builddir)/Sources/Core/libclan22Core.la -lpthread | |
149 | libclan22Sqlite_la_LDFLAGS = \ | |
150 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ | |
151 | - $(extra_LIBS_Sqlite) | |
152 | + $(extra_LIBS_clanSqlite) | |
153 | ||
154 | libclan22Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite) | |
155 | ||
156 | --- ClanLib-2.2.7/Sources/Display/Makefile.am.orig 2011-03-26 20:24:07.184910453 +0100 | |
157 | +++ ClanLib-2.2.7/Sources/Display/Makefile.am 2011-03-26 20:25:43.388909615 +0100 | |
158 | @@ -1,6 +1,7 @@ | |
159 | lib_LTLIBRARIES = libclan22Display.la | |
160 | ||
161 | if WIN32 | |
162 | +libclan22Display_la_LIBADD = | |
163 | else | |
164 | libclan22Display_la_LIBADD = -lpng -ljpeg | |
165 | endif | |
166 | @@ -182,6 +183,7 @@ | |
167 | X11/font_config.cpp \ | |
168 | X11/font_config.h | |
169 | endif | |
170 | +libclan22Display_la_LIBADD += $(top_builddir)/Sources/Core/libclan22Core.la $(clanDisplay_LIBS) | |
171 | libclan22Display_la_LDFLAGS = \ | |
172 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \ | |
173 | $(extra_LIBS_clanDisplay) | |
174 | --- ClanLib-2.2.7/configure.ac.orig 2011-01-27 09:46:22.000000000 +0100 | |
175 | +++ ClanLib-2.2.7/configure.ac 2011-03-26 15:25:57.540910453 +0100 | |
176 | @@ -631,9 +631,14 @@ | |
177 | dnl Set the include path | |
178 | CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources" | |
179 | ||
180 | +ClanLib_Modules= | |
181 | +ClanLib_pkgconfig= | |
182 | +ClanLib_API_Modules= | |
183 | dnl Modules which will be build | |
184 | -ClanLib_Modules="App" | |
185 | -ClanLib_pkgconfig="clanApp.pc" | |
186 | +CLANLIB_ENABLE_MODULES(Core) | |
187 | + | |
188 | +ClanLib_Modules="$ClanLib_Modules App" | |
189 | +ClanLib_pkgconfig="$ClanLib_pkgconfig clanApp.pc" | |
190 | ||
191 | dnl API header files for the Modules which will be installed | |
192 | ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)" | |
193 | @@ -641,7 +646,6 @@ | |
194 | dnl Default examples which will be build | |
195 | dnl (Currently Disabled) | |
196 | ClanLib_Examples="" | |
197 | -CLANLIB_ENABLE_MODULES(Core) | |
198 | ||
199 | if test "$enable_clanDisplay" = "yes"; then | |
200 | CLANLIB_ENABLE_MODULES(Display) | |
201 | @@ -670,14 +674,14 @@ | |
202 | CLANLIB_ENABLE_MODULES(GL1) | |
203 | fi | |
204 | ||
205 | -if test "$enable_clanGUI" = "yes"; then | |
206 | - CLANLIB_ENABLE_MODULES(GUI) | |
207 | -fi | |
208 | - | |
209 | if test "$enable_clanCSSLayout" = "yes"; then | |
210 | CLANLIB_ENABLE_MODULES(CSSLayout) | |
211 | fi | |
212 | ||
213 | +if test "$enable_clanGUI" = "yes"; then | |
214 | + CLANLIB_ENABLE_MODULES(GUI) | |
215 | +fi | |
216 | + | |
217 | if test "$enable_clanSWRender" = "yes"; then | |
218 | CLANLIB_ENABLE_MODULES(SWRender) | |
219 | fi |