]>
Commit | Line | Data |
---|---|---|
b885f6d4 JK |
1 | diff -uNr SimGear-1.9.1.orig/simgear/bucket/Makefile.am SimGear-1.9.1/simgear/bucket/Makefile.am |
2 | --- SimGear-1.9.1.orig/simgear/bucket/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
3 | +++ SimGear-1.9.1/simgear/bucket/Makefile.am 2009-08-12 11:13:26.000000000 +0200 | |
4 | @@ -5,6 +5,8 @@ | |
5 | include_HEADERS = newbucket.hxx | |
6 | ||
7 | libsgbucket_la_SOURCES = newbucket.cxx | |
8 | +libsgbucket_la_LIBADD = \ | |
9 | + $(top_builddir)/simgear/misc/libsgmisc.la | |
10 | ||
11 | # noinst_PROGRAMS = testbucket | |
12 | ||
13 | diff -uNr SimGear-1.9.1.orig/simgear/environment/Makefile.am SimGear-1.9.1/simgear/environment/Makefile.am | |
14 | --- SimGear-1.9.1.orig/simgear/environment/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
15 | +++ SimGear-1.9.1/simgear/environment/Makefile.am 2009-08-12 13:25:18.000000000 +0200 | |
16 | @@ -6,4 +6,13 @@ | |
17 | ||
18 | libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx | |
19 | ||
20 | +libsgenvironment_la_LIBADD = \ | |
21 | + $(top_builddir)/simgear/io/libsgio.la \ | |
22 | + $(top_builddir)/simgear/math/libsgmath.la \ | |
23 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
24 | + $(top_builddir)/simgear/scene/sky/libsgsky.la \ | |
25 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
26 | + -losg \ | |
27 | + -losgParticle | |
28 | + | |
29 | INCLUDES = -I$(top_srcdir) | |
30 | diff -uNr SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am SimGear-1.9.1/simgear/ephemeris/Makefile.am | |
31 | --- SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
32 | +++ SimGear-1.9.1/simgear/ephemeris/Makefile.am 2009-08-12 12:30:32.000000000 +0200 | |
33 | @@ -31,4 +31,8 @@ | |
34 | uranus.cxx \ | |
35 | venus.cxx | |
36 | ||
37 | +libsgephem_la_LIBADD = \ | |
38 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
39 | + $(top_builddir)/simgear/misc/libsgmisc.la | |
40 | + | |
41 | INCLUDES = -I$(top_srcdir) | |
e26f8204 | 42 | diff -uNr SimGear-1.9.1.orig/simgear/io/Makefile.am SimGear-1.9.1/simgear/io/Makefile.am |
b885f6d4 JK |
43 | --- SimGear-1.9.1.orig/simgear/io/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
44 | +++ SimGear-1.9.1/simgear/io/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
e26f8204 JK |
45 | @@ -20,6 +20,14 @@ |
46 | sg_socket.cxx \ | |
47 | sg_socket_udp.cxx | |
48 | ||
49 | +libsgio_la_LIBADD = \ | |
50 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ | |
51 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
52 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
53 | + $(top_builddir)/simgear/serial/libsgserial.la \ | |
54 | + -lplibnet \ | |
55 | + -lz | |
56 | + | |
57 | INCLUDES = -I$(top_srcdir) | |
58 | ||
59 | noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client | |
60 | diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am SimGear-1.9.1/simgear/math/Makefile.am | |
b885f6d4 JK |
61 | --- SimGear-1.9.1.orig/simgear/math/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
62 | +++ SimGear-1.9.1/simgear/math/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
e26f8204 JK |
63 | @@ -52,4 +52,8 @@ |
64 | SGGeod.cxx \ | |
7be571f7 | 65 | SGGeodesy.cxx |
66 | ||
67 | +libsgmath_la_LIBADD = \ | |
68 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
69 | + $(top_builddir)/simgear/misc/libsgmisc.la | |
70 | + | |
71 | INCLUDES = -I$(top_srcdir) | |
e26f8204 | 72 | diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am SimGear-1.9.1/simgear/misc/Makefile.am |
b885f6d4 JK |
73 | --- SimGear-1.9.1.orig/simgear/misc/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
74 | +++ SimGear-1.9.1/simgear/misc/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
e26f8204 JK |
75 | @@ -24,6 +24,14 @@ |
76 | interpolator.cxx \ | |
77 | PathOptions.cxx | |
7be571f7 | 78 | |
e26f8204 | 79 | +libsgmisc_la_LIBADD = \ |
7be571f7 | 80 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
e26f8204 JK |
81 | + $(top_builddir)/simgear/structure/libsgstructure.la \ |
82 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
83 | + -lz \ | |
84 | + -losg \ | |
85 | + -losgDB | |
86 | + | |
87 | noinst_PROGRAMS = tabbed_value_test swap_test | |
88 | ||
89 | tabbed_value_test_SOURCES = tabbed_values_test.cxx | |
b885f6d4 JK |
90 | diff -uNr SimGear-1.9.1.orig/simgear/nasal/Makefile.am SimGear-1.9.1/simgear/nasal/Makefile.am |
91 | --- SimGear-1.9.1.orig/simgear/nasal/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
92 | +++ SimGear-1.9.1/simgear/nasal/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
93 | @@ -10,4 +10,8 @@ | |
94 | thread-posix.c thread-win32.c threadlib.c \ | |
95 | utf8lib.c vector.c | |
96 | ||
97 | +libsgnasal_la_LIBADD = \ | |
98 | + -lm \ | |
99 | + -lpthread | |
e26f8204 | 100 | + |
b885f6d4 | 101 | INCLUDES = -I$(top_srcdir) |
e26f8204 | 102 | diff -uNr SimGear-1.9.1.orig/simgear/props/Makefile.am SimGear-1.9.1/simgear/props/Makefile.am |
b885f6d4 JK |
103 | --- SimGear-1.9.1.orig/simgear/props/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
104 | +++ SimGear-1.9.1/simgear/props/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
e577b99e | 105 | @@ -12,6 +12,9 @@ |
e26f8204 JK |
106 | props.cxx \ |
107 | props_io.cxx | |
108 | ||
109 | +libsgprops_la_LIBADD = \ | |
b885f6d4 | 110 | + $(top_builddir)/simgear/xml/libsgxml.la \ |
e577b99e | 111 | + $(top_builddir)/simgear/debug/libsgdebug.la |
7be571f7 | 112 | |
e26f8204 JK |
113 | # NOTE: Looped dependencies misc and props test files, commenting this one out |
114 | # noinst_PROGRAMS = props_test | |
115 | diff -uNr SimGear-1.9.1.orig/simgear/route/Makefile.am SimGear-1.9.1/simgear/route/Makefile.am | |
b885f6d4 JK |
116 | --- SimGear-1.9.1.orig/simgear/route/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
117 | +++ SimGear-1.9.1/simgear/route/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
7be571f7 | 118 | @@ -8,6 +8,9 @@ |
119 | route.cxx \ | |
120 | waypoint.cxx | |
121 | ||
122 | +libsgroute_la_LIBADD = \ | |
123 | + $(top_builddir)/simgear/math/libsgmath.la | |
124 | + | |
125 | INCLUDES = -I$(top_srcdir) | |
126 | ||
127 | noinst_PROGRAMS = waytest routetest | |
b885f6d4 JK |
128 | diff -uNr SimGear-1.9.1.orig/simgear/scene/Makefile.am SimGear-1.9.1/simgear/scene/Makefile.am |
129 | --- SimGear-1.9.1.orig/simgear/scene/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
130 | +++ SimGear-1.9.1/simgear/scene/Makefile.am 2009-08-12 14:33:12.000000000 +0200 | |
131 | @@ -1,7 +1,6 @@ | |
132 | includedir = @includedir@/scene | |
133 | ||
134 | -SUBDIRS = material model sky tgdb util | |
135 | - | |
136 | +SUBDIRS = util tgdb model material sky | |
137 | # lib_LIBRARIES = libsgscene.a | |
138 | ||
139 | # noinst_HEADERS = | |
140 | diff -uNr SimGear-1.9.1.orig/simgear/scene/material/Makefile.am SimGear-1.9.1/simgear/scene/material/Makefile.am | |
141 | --- SimGear-1.9.1.orig/simgear/scene/material/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
142 | +++ SimGear-1.9.1/simgear/scene/material/Makefile.am 2009-08-12 13:49:46.000000000 +0200 | |
143 | @@ -14,4 +14,15 @@ | |
144 | matlib.cxx \ | |
145 | matmodel.cxx | |
146 | ||
147 | +libsgmaterial_la_LIBADD = \ | |
148 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
149 | + $(top_builddir)/simgear/math/libsgmath.la \ | |
150 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
151 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
152 | + $(top_builddir)/simgear/scene/model/libsgmodel.la \ | |
153 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
154 | + -losg \ | |
155 | + -losgDB \ | |
156 | + -lplibul | |
157 | + | |
158 | INCLUDES = -I$(top_srcdir) | |
159 | diff -uNr SimGear-1.9.1.orig/simgear/scene/model/Makefile.am SimGear-1.9.1/simgear/scene/model/Makefile.am | |
160 | --- SimGear-1.9.1.orig/simgear/scene/model/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
161 | +++ SimGear-1.9.1/simgear/scene/model/Makefile.am 2009-08-12 13:29:53.000000000 +0200 | |
162 | @@ -46,4 +46,19 @@ | |
163 | SGScaleTransform.cxx \ | |
164 | SGTranslateTransform.cxx | |
165 | ||
166 | +libsgmodel_la_LIBADD = \ | |
167 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
168 | + $(top_builddir)/simgear/math/libsgmath.la \ | |
169 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
170 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
171 | + $(top_builddir)/simgear/screen/libsgscreen.la \ | |
172 | + $(top_builddir)/simgear/scene/tgdb/libsgtgdb.la \ | |
173 | + $(top_builddir)/simgear/scene/util/libsgutil.la \ | |
174 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
175 | + -lGL \ | |
176 | + -losg \ | |
177 | + -losgDB \ | |
178 | + -losgParticle \ | |
179 | + -losgUtil | |
180 | + | |
181 | INCLUDES = -I$(top_srcdir) | |
182 | diff -uNr SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am SimGear-1.9.1/simgear/scene/sky/Makefile.am | |
183 | --- SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
184 | +++ SimGear-1.9.1/simgear/scene/sky/Makefile.am 2009-08-12 13:47:18.000000000 +0200 | |
185 | @@ -28,4 +28,17 @@ | |
186 | newcloud.cxx \ | |
187 | CloudShaderGeometry.cxx | |
188 | ||
189 | +libsgsky_la_LIBADD = \ | |
190 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
191 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
192 | + $(top_builddir)/simgear/math/libsgmath.la \ | |
193 | + $(top_builddir)/simgear/scene/model/libsgmodel.la \ | |
194 | + $(top_builddir)/simgear/scene/util/libsgutil.la \ | |
195 | + $(top_builddir)/simgear/screen/libsgscreen.la \ | |
196 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
197 | + -losg \ | |
198 | + -losgDB \ | |
199 | + -lGL \ | |
200 | + -lGLU | |
201 | + | |
202 | INCLUDES = -I$(top_srcdir) | |
203 | diff -uNr SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am SimGear-1.9.1/simgear/scene/tgdb/Makefile.am | |
204 | --- SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
205 | +++ SimGear-1.9.1/simgear/scene/tgdb/Makefile.am 2009-08-12 15:05:23.000000000 +0200 | |
206 | @@ -40,4 +39,21 @@ | |
207 | TileEntry.cxx \ | |
208 | TreeBin.cxx TreeBin.hxx | |
209 | ||
210 | +libsgtgdb_la_LIBADD = \ | |
211 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ | |
212 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
213 | + $(top_builddir)/simgear/io/libsgio.la \ | |
214 | + $(top_builddir)/simgear/math/libsgmath.la \ | |
215 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
216 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
217 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
218 | + -lGL \ | |
219 | + -losg \ | |
220 | + -losgDB \ | |
221 | + -losgUtil | |
222 | + | |
223 | +# $(top_builddir)/scene/util/libsutil.la | |
224 | +# $(top_builddir)/scene/model/libsgmodel.la | |
225 | +# $(top_builddir)/scene/material/libsgmaterial.la | |
226 | + | |
227 | INCLUDES = -I$(top_srcdir) | |
228 | diff -uNr SimGear-1.9.1.orig/simgear/scene/util/Makefile.am SimGear-1.9.1/simgear/scene/util/Makefile.am | |
229 | --- SimGear-1.9.1.orig/simgear/scene/util/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
230 | +++ SimGear-1.9.1/simgear/scene/util/Makefile.am 2009-08-12 11:55:02.000000000 +0200 | |
231 | @@ -31,4 +31,8 @@ | |
232 | StateAttributeFactory.cxx \ | |
233 | QuadTreeBuilder.cxx | |
234 | ||
235 | +libsgutil_la_LIBADD = \ | |
236 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
237 | + -losg | |
238 | + | |
239 | INCLUDES = -I$(top_srcdir) | |
e26f8204 | 240 | diff -uNr SimGear-1.9.1.orig/simgear/screen/Makefile.am SimGear-1.9.1/simgear/screen/Makefile.am |
b885f6d4 JK |
241 | --- SimGear-1.9.1.orig/simgear/screen/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
242 | +++ SimGear-1.9.1/simgear/screen/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
243 | @@ -35,6 +35,12 @@ | |
e26f8204 JK |
244 | shader.cpp \ |
245 | win32-printer.h | |
7be571f7 | 246 | |
e26f8204 JK |
247 | +libsgscreen_la_LIBADD = \ |
248 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
b885f6d4 JK |
249 | + -lz \ |
250 | + -lplibssg \ | |
251 | + -lGLU | |
e26f8204 JK |
252 | + |
253 | if HAVE_GLUT | |
254 | noinst_PROGRAMS = TestRenderTexture | |
7be571f7 | 255 | |
b885f6d4 JK |
256 | diff -uNr SimGear-1.9.1.orig/simgear/serial/Makefile.am SimGear-1.9.1/simgear/serial/Makefile.am |
257 | --- SimGear-1.9.1.orig/simgear/serial/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
258 | +++ SimGear-1.9.1/simgear/serial/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
259 | @@ -6,6 +6,9 @@ | |
260 | ||
261 | libsgserial_la_SOURCES = serial.cxx | |
262 | ||
263 | +libsgserial_la_LIBADD = \ | |
264 | + $(top_builddir)/simgear/debug/libsgdebug.la | |
265 | + | |
266 | noinst_PROGRAMS = testserial | |
267 | ||
268 | testserial_SOURCES = testserial.cxx | |
e26f8204 | 269 | diff -uNr SimGear-1.9.1.orig/simgear/sound/Makefile.am SimGear-1.9.1/simgear/sound/Makefile.am |
b885f6d4 JK |
270 | --- SimGear-1.9.1.orig/simgear/sound/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
271 | +++ SimGear-1.9.1/simgear/sound/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
7be571f7 | 272 | @@ -16,6 +16,13 @@ |
273 | soundmgr_openal.cxx \ | |
274 | xmlsound.cxx | |
275 | ||
276 | +libsgsound_la_LIBADD = \ | |
277 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
278 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
279 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
280 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
281 | + -lalut | |
282 | + | |
283 | noinst_PROGRAMS = openal_test1 openal_test2 | |
284 | ||
285 | openal_test1_SOURCES = openal_test1.cxx | |
e26f8204 | 286 | diff -uNr SimGear-1.9.1.orig/simgear/structure/Makefile.am SimGear-1.9.1/simgear/structure/Makefile.am |
b885f6d4 JK |
287 | --- SimGear-1.9.1.orig/simgear/structure/Makefile.am 2009-08-12 15:08:50.000000000 +0200 |
288 | +++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
289 | @@ -30,5 +30,10 @@ | |
e26f8204 JK |
290 | SGSmplhist.cxx \ |
291 | SGSmplstat.cxx | |
7be571f7 | 292 | |
e26f8204 | 293 | +libsgstructure_la_LIBADD = \ |
b885f6d4 | 294 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
e26f8204 | 295 | + $(top_builddir)/simgear/timing/libsgtiming.la \ |
7be571f7 | 296 | + -lz |
297 | + | |
298 | INCLUDES = -I$(top_srcdir) | |
299 | ||
b885f6d4 JK |
300 | diff -uNr SimGear-1.9.1.orig/simgear/timing/Makefile.am SimGear-1.9.1/simgear/timing/Makefile.am |
301 | --- SimGear-1.9.1.orig/simgear/timing/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
302 | +++ SimGear-1.9.1/simgear/timing/Makefile.am 2009-08-12 09:40:02.000000000 +0200 | |
303 | @@ -16,4 +16,7 @@ | |
304 | timestamp.cxx \ | |
305 | timezone.cxx | |
306 | ||
307 | +libsgtiming_la_LIBADD = \ | |
308 | + $(top_builddir)/simgear/debug/libsgdebug.la | |
309 | + | |
310 | INCLUDES = -I$(top_srcdir) | |
311 | diff -uNr SimGear-1.9.1.orig/simgear/xml/Makefile.am SimGear-1.9.1/simgear/xml/Makefile.am | |
312 | --- SimGear-1.9.1.orig/simgear/xml/Makefile.am 2009-08-12 15:08:50.000000000 +0200 | |
313 | +++ SimGear-1.9.1/simgear/xml/Makefile.am 2009-08-12 09:51:44.000000000 +0200 | |
314 | @@ -18,4 +18,7 @@ | |
315 | xmltok.h xmltok.c \ | |
316 | xmltok_impl.h | |
317 | ||
318 | +libsgxml_la_LIBADD = \ | |
319 | + $(top_builddir)/simgear/structure/libsgstructure.la | |
320 | + | |
321 | INCLUDES = -I$(top_srcdir) |