]>
Commit | Line | Data |
---|---|---|
e26f8204 JK |
1 | diff -uNr SimGear-1.9.1.orig/configure.ac SimGear-1.9.1/configure.ac |
2 | --- SimGear-1.9.1.orig/configure.ac 2009-01-25 13:03:56.000000000 +0100 | |
3 | +++ SimGear-1.9.1/configure.ac 2009-08-11 14:32:11.000000000 +0200 | |
4 | @@ -34,7 +34,7 @@ | |
5 | AC_PROG_CC | |
6 | AC_PROG_CPP | |
7 | AC_PROG_CXX | |
8 | -AC_PROG_RANLIB | |
9 | +AC_PROG_LIBTOOL | |
10 | AC_PROG_INSTALL | |
11 | AC_PROG_LN_S | |
12 | AX_BOOST_BASE([1.34.0]) | |
13 | diff -uNr SimGear-1.9.1.orig/simgear/bucket/Makefile.am SimGear-1.9.1/simgear/bucket/Makefile.am | |
14 | --- SimGear-1.9.1.orig/simgear/bucket/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
15 | +++ SimGear-1.9.1/simgear/bucket/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
16 | @@ -1,10 +1,10 @@ | |
17 | includedir = @includedir@/bucket | |
18 | ||
19 | -lib_LIBRARIES = libsgbucket.a | |
20 | +lib_LTLIBRARIES = libsgbucket.la | |
21 | ||
22 | include_HEADERS = newbucket.hxx | |
23 | ||
24 | -libsgbucket_a_SOURCES = newbucket.cxx | |
25 | +libsgbucket_la_SOURCES = newbucket.cxx | |
26 | ||
27 | # noinst_PROGRAMS = testbucket | |
28 | ||
29 | diff -uNr SimGear-1.9.1.orig/simgear/debug/Makefile.am SimGear-1.9.1/simgear/debug/Makefile.am | |
30 | --- SimGear-1.9.1.orig/simgear/debug/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
31 | +++ SimGear-1.9.1/simgear/debug/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
32 | @@ -2,10 +2,10 @@ | |
33 | ||
34 | EXTRA_DIST = logtest.cxx | |
35 | ||
36 | -lib_LIBRARIES = libsgdebug.a | |
37 | +lib_LTLIBRARIES = libsgdebug.la | |
38 | ||
39 | include_HEADERS = debug_types.h logstream.hxx | |
40 | ||
41 | -libsgdebug_a_SOURCES = logstream.cxx | |
42 | +libsgdebug_la_SOURCES = logstream.cxx | |
43 | ||
44 | INCLUDES = -I$(top_srcdir) | |
45 | diff -uNr SimGear-1.9.1.orig/simgear/environment/Makefile.am SimGear-1.9.1/simgear/environment/Makefile.am | |
46 | --- SimGear-1.9.1.orig/simgear/environment/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
47 | +++ SimGear-1.9.1/simgear/environment/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
d915e359 SZ |
48 | @@ -1,9 +1,9 @@ |
49 | includedir = @includedir@/environment | |
50 | ||
51 | -lib_LIBRARIES = libsgenvironment.a | |
52 | +lib_LTLIBRARIES = libsgenvironment.la | |
53 | ||
e26f8204 | 54 | include_HEADERS = metar.hxx visual_enviro.hxx precipitation.hxx |
d915e359 | 55 | |
e26f8204 JK |
56 | -libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx |
57 | +libsgenvironment_la_SOURCES = metar.cxx visual_enviro.cxx precipitation.cxx | |
d915e359 SZ |
58 | |
59 | INCLUDES = -I$(top_srcdir) | |
e26f8204 JK |
60 | diff -uNr SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am SimGear-1.9.1/simgear/ephemeris/Makefile.am |
61 | --- SimGear-1.9.1.orig/simgear/ephemeris/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
62 | +++ SimGear-1.9.1/simgear/ephemeris/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
63 | @@ -1,6 +1,6 @@ | |
64 | includedir = @includedir@/ephemeris | |
11cce033 | 65 | |
e26f8204 JK |
66 | -lib_LIBRARIES = libsgephem.a |
67 | +lib_LTLIBRARIES = libsgephem.la | |
11cce033 | 68 | |
e26f8204 JK |
69 | include_HEADERS = \ |
70 | celestialBody.hxx \ | |
71 | @@ -16,7 +16,7 @@ | |
72 | uranus.hxx \ | |
73 | venus.hxx | |
11cce033 | 74 | |
e26f8204 JK |
75 | -libsgephem_a_SOURCES = \ |
76 | +libsgephem_la_SOURCES = \ | |
77 | celestialBody.cxx \ | |
78 | ephemeris.cxx \ | |
79 | jupiter.cxx \ | |
80 | diff -uNr SimGear-1.9.1.orig/simgear/io/Makefile.am SimGear-1.9.1/simgear/io/Makefile.am | |
81 | --- SimGear-1.9.1.orig/simgear/io/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
82 | +++ SimGear-1.9.1/simgear/io/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
8a000a2b SZ |
83 | @@ -1,6 +1,6 @@ |
84 | includedir = @includedir@/io | |
85 | ||
86 | -lib_LIBRARIES = libsgio.a | |
87 | +lib_LTLIBRARIES = libsgio.la | |
88 | ||
89 | include_HEADERS = \ | |
90 | iochannel.hxx \ | |
172de490 MM |
91 | @@ -11,7 +11,7 @@ |
92 | sg_socket.hxx \ | |
93 | sg_socket_udp.hxx | |
8a000a2b SZ |
94 | |
95 | -libsgio_a_SOURCES = \ | |
96 | +libsgio_la_SOURCES = \ | |
97 | iochannel.cxx \ | |
172de490 MM |
98 | lowlevel.cxx \ |
99 | sg_binobj.cxx \ | |
e26f8204 | 100 | @@ -27,10 +27,10 @@ |
e2945762 | 101 | tcp_server_SOURCES = tcp_server.cxx |
102 | ||
103 | tcp_server_LDADD = \ | |
e26f8204 | 104 | - libsgio.a \ |
e2945762 | 105 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
106 | - $(top_builddir)/simgear/bucket/libsgbucket.a \ | |
107 | - $(top_builddir)/simgear/misc/libsgmisc.a \ | |
e26f8204 | 108 | + libsgio.la \ |
e2945762 | 109 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
110 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ | |
111 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
184dbcd1 | 112 | -lplibnet -lplibul -lz \ |
113 | $(network_LIBS) \ | |
114 | $(base_LIBS) | |
e26f8204 | 115 | @@ -38,10 +38,10 @@ |
e2945762 | 116 | tcp_client_SOURCES = tcp_client.cxx |
117 | ||
118 | tcp_client_LDADD = \ | |
e26f8204 | 119 | - libsgio.a \ |
e2945762 | 120 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
121 | - $(top_builddir)/simgear/bucket/libsgbucket.a \ | |
122 | - $(top_builddir)/simgear/misc/libsgmisc.a \ | |
e26f8204 | 123 | + libsgio.la \ |
e2945762 | 124 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
125 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ | |
126 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
184dbcd1 | 127 | -lplibnet -lplibul -lz \ |
128 | $(network_LIBS) \ | |
129 | $(base_LIBS) | |
e26f8204 | 130 | @@ -49,10 +49,10 @@ |
8a000a2b SZ |
131 | socktest_SOURCES = socktest.cxx |
132 | ||
133 | socktest_LDADD = \ | |
e26f8204 | 134 | - libsgio.a \ |
172de490 | 135 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
d915e359 | 136 | - $(top_builddir)/simgear/bucket/libsgbucket.a \ |
172de490 | 137 | - $(top_builddir)/simgear/misc/libsgmisc.a \ |
e26f8204 | 138 | + libsgio.la \ |
172de490 | 139 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
d915e359 | 140 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ |
172de490 | 141 | + $(top_builddir)/simgear/misc/libsgmisc.la \ |
184dbcd1 | 142 | -lplibnet -lplibul -lz \ |
143 | $(network_LIBS) \ | |
144 | $(base_LIBS) | |
e26f8204 | 145 | @@ -60,17 +60,17 @@ |
172de490 MM |
146 | lowtest_SOURCES = lowtest.cxx |
147 | ||
148 | lowtest_LDADD = \ | |
e26f8204 | 149 | - libsgio.a \ |
d915e359 SZ |
150 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
151 | - $(top_builddir)/simgear/bucket/libsgbucket.a \ | |
152 | - $(top_builddir)/simgear/misc/libsgmisc.a \ | |
e26f8204 | 153 | + libsgio.la \ |
8a000a2b | 154 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
d915e359 | 155 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ |
f15444c2 | 156 | + $(top_builddir)/simgear/misc/libsgmisc.la \ |
e26f8204 | 157 | $(base_LIBS) -lz |
172de490 MM |
158 | |
159 | decode_binobj_SOURCES = decode_binobj.cxx | |
160 | ||
161 | decode_binobj_LDADD = \ | |
e26f8204 | 162 | - libsgio.a \ |
d915e359 | 163 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
184dbcd1 | 164 | - $(top_builddir)/simgear/bucket/libsgbucket.a \ |
165 | - $(top_builddir)/simgear/misc/libsgmisc.a \ | |
e26f8204 | 166 | + libsgio.la \ |
d915e359 | 167 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
184dbcd1 | 168 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ |
169 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
e26f8204 JK |
170 | $(base_LIBS) -lz |
171 | diff -uNr SimGear-1.9.1.orig/simgear/magvar/Makefile.am SimGear-1.9.1/simgear/magvar/Makefile.am | |
172 | --- SimGear-1.9.1.orig/simgear/magvar/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
173 | +++ SimGear-1.9.1/simgear/magvar/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
8a000a2b | 174 | @@ -1,10 +1,10 @@ |
e26f8204 | 175 | includedir = @includedir@/magvar |
8a000a2b | 176 | |
e26f8204 JK |
177 | -lib_LIBRARIES = libsgmagvar.a |
178 | +lib_LTLIBRARIES = libsgmagvar.la | |
8a000a2b | 179 | |
e26f8204 | 180 | include_HEADERS = magvar.hxx |
8a000a2b | 181 | |
e26f8204 JK |
182 | -libsgmagvar_a_SOURCES = \ |
183 | +libsgmagvar_la_SOURCES = \ | |
184 | coremag.hxx coremag.cxx \ | |
185 | magvar.cxx | |
8a000a2b | 186 | |
e26f8204 JK |
187 | @@ -13,7 +13,7 @@ |
188 | testmagvar_SOURCES = testmagvar.cxx | |
8a000a2b | 189 | |
e26f8204 JK |
190 | testmagvar_LDADD = \ |
191 | - libsgmagvar.a \ | |
192 | + libsgmagvar.la \ | |
193 | $(base_LIBS) | |
8a000a2b | 194 | |
e26f8204 JK |
195 | INCLUDES = -I$(top_srcdir) |
196 | diff -uNr SimGear-1.9.1.orig/simgear/Makefile.am SimGear-1.9.1/simgear/Makefile.am | |
197 | --- SimGear-1.9.1.orig/simgear/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
198 | +++ SimGear-1.9.1/simgear/Makefile.am 2009-08-11 14:33:26.000000000 +0200 | |
199 | @@ -16,22 +16,22 @@ | |
200 | $(compatibility_DIR) \ | |
b885f6d4 | 201 | - xml \ |
e26f8204 | 202 | debug \ |
b885f6d4 JK |
203 | + serial \ |
204 | + nasal \ | |
e26f8204 | 205 | - misc \ |
b885f6d4 | 206 | + timing \ |
e26f8204 | 207 | structure \ |
b885f6d4 | 208 | + xml \ |
e26f8204 JK |
209 | + props \ |
210 | + misc \ | |
211 | bucket \ | |
212 | ephemeris \ | |
e26f8204 JK |
213 | io \ |
214 | magvar \ | |
215 | math \ | |
b885f6d4 JK |
216 | - $(METAR_DIRS) \ |
217 | - nasal \ | |
e26f8204 JK |
218 | - props \ |
219 | route \ | |
b885f6d4 | 220 | - scene \ |
e26f8204 JK |
221 | screen \ |
222 | - serial \ | |
223 | sound \ | |
224 | - $(SGTHREAD_DIR) \ | |
225 | - timing | |
b885f6d4 JK |
226 | + scene \ |
227 | + $(METAR_DIRS) \ | |
e26f8204 JK |
228 | + $(SGTHREAD_DIR) |
229 | ||
230 | DIST_SUBDIRS = $(SUBDIRS) compatibility | |
231 | diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am SimGear-1.9.1/simgear/math/Makefile.am | |
232 | --- SimGear-1.9.1.orig/simgear/math/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
233 | +++ SimGear-1.9.1/simgear/math/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
234 | @@ -4,12 +4,12 @@ | |
235 | TESTS = $(check_PROGRAMS) | |
8a000a2b | 236 | |
e26f8204 JK |
237 | SGMathTest_SOURCES = SGMathTest.cxx |
238 | -SGMathTest_LDADD = libsgmath.a $(base_LIBS) | |
239 | +SGMathTest_LDADD = libsgmath.la $(base_LIBS) | |
11cce033 | 240 | |
e26f8204 JK |
241 | SGGeometryTest_SOURCES = SGGeometryTest.cxx |
242 | -SGGeometryTest_LDADD = libsgmath.a $(base_LIBS) | |
243 | +SGGeometryTest_LDADD = libsgmath.la $(base_LIBS) | |
11cce033 | 244 | |
e26f8204 JK |
245 | -lib_LIBRARIES = libsgmath.a |
246 | +lib_LTLIBRARIES = libsgmath.la | |
11cce033 | 247 | |
e26f8204 JK |
248 | include_HEADERS = \ |
249 | interpolater.hxx \ | |
250 | @@ -44,7 +44,7 @@ | |
251 | SGVec3.hxx \ | |
252 | SGVec4.hxx | |
11cce033 | 253 | |
e26f8204 JK |
254 | -libsgmath_a_SOURCES = \ |
255 | +libsgmath_la_SOURCES = \ | |
256 | interpolater.cxx \ | |
257 | leastsqs.cxx \ | |
258 | sg_random.c \ | |
259 | diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am SimGear-1.9.1/simgear/misc/Makefile.am | |
260 | --- SimGear-1.9.1.orig/simgear/misc/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
261 | +++ SimGear-1.9.1/simgear/misc/Makefile.am 2009-08-11 14:34:32.000000000 +0200 | |
172de490 MM |
262 | @@ -1,6 +1,6 @@ |
263 | includedir = @includedir@/misc | |
8a000a2b SZ |
264 | |
265 | -lib_LIBRARIES = libsgmisc.a | |
266 | +lib_LTLIBRARIES = libsgmisc.la | |
267 | ||
268 | include_HEADERS = \ | |
184dbcd1 | 269 | sg_path.hxx \ |
e26f8204 JK |
270 | @@ -14,7 +14,7 @@ |
271 | stdint.hxx \ | |
272 | PathOptions.hxx | |
8a000a2b SZ |
273 | |
274 | -libsgmisc_a_SOURCES = \ | |
275 | +libsgmisc_la_SOURCES = \ | |
e2945762 | 276 | sg_path.cxx \ |
184dbcd1 | 277 | sgstream.cxx \ |
278 | strutils.cxx \ | |
e26f8204 | 279 | @@ -28,15 +28,15 @@ |
e2945762 | 280 | |
281 | tabbed_value_test_SOURCES = tabbed_values_test.cxx | |
282 | tabbed_value_test_LDADD = \ | |
e26f8204 | 283 | - libsgmisc.a \ |
e2945762 | 284 | - $(top_builddir)/simgear/xml/libsgxml.a \ |
285 | - $(top_builddir)/simgear/debug/libsgdebug.a | |
e26f8204 | 286 | + libsgmisc.la \ |
e2945762 | 287 | + $(top_builddir)/simgear/xml/libsgxml.la \ |
e26f8204 | 288 | + $(top_builddir)/simgear/debug/libsgdebug.la |
11cce033 | 289 | |
e26f8204 JK |
290 | $(top_builddir)/simgear/xml/libsgxml.a: |
291 | - cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.a | |
292 | + cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.la | |
e2945762 | 293 | |
e26f8204 JK |
294 | $(top_builddir)/simgear/debug/libsgdebug.a: |
295 | - cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.a | |
296 | + cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.la | |
d915e359 | 297 | |
e26f8204 | 298 | swap_test_SOURCES = swap_test.cpp |
d915e359 | 299 | |
e26f8204 JK |
300 | diff -uNr SimGear-1.9.1.orig/simgear/nasal/Makefile.am SimGear-1.9.1/simgear/nasal/Makefile.am |
301 | --- SimGear-1.9.1.orig/simgear/nasal/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
302 | +++ SimGear-1.9.1/simgear/nasal/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
303 | @@ -1,10 +1,10 @@ | |
304 | includedir = @includedir@/nasal | |
d915e359 | 305 | |
e26f8204 JK |
306 | -lib_LIBRARIES = libsgnasal.a |
307 | +lib_LTLIBRARIES = libsgnasal.la | |
11cce033 | 308 | |
e26f8204 JK |
309 | include_HEADERS = nasal.h naref.h |
310 | ||
311 | -libsgnasal_a_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c \ | |
312 | +libsgnasal_la_SOURCES = bitslib.c code.c code.h codegen.c data.h gc.c \ | |
313 | hash.c iolib.c iolib.h lex.c lib.c mathlib.c \ | |
314 | misc.c naref.h nasal.h parse.c parse.h string.c \ | |
315 | thread-posix.c thread-win32.c threadlib.c \ | |
316 | diff -uNr SimGear-1.9.1.orig/simgear/props/Makefile.am SimGear-1.9.1/simgear/props/Makefile.am | |
317 | --- SimGear-1.9.1.orig/simgear/props/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
318 | +++ SimGear-1.9.1/simgear/props/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
319 | @@ -1,25 +1,27 @@ | |
e2945762 | 320 | includedir = @includedir@/props |
321 | ||
322 | -lib_LIBRARIES = libsgprops.a | |
323 | +lib_LTLIBRARIES = libsgprops.la | |
324 | ||
325 | include_HEADERS = \ | |
326 | condition.hxx \ | |
327 | props.hxx \ | |
328 | props_io.hxx | |
329 | ||
330 | -libsgprops_a_SOURCES = \ | |
331 | +libsgprops_la_SOURCES = \ | |
332 | condition.cxx \ | |
8a000a2b | 333 | props.cxx \ |
184dbcd1 | 334 | props_io.cxx |
172de490 | 335 | |
e26f8204 JK |
336 | -noinst_PROGRAMS = props_test |
337 | ||
338 | -props_test_SOURCES = props_test.cxx | |
339 | -props_test_LDADD = \ | |
340 | - libsgprops.a \ | |
e2945762 | 341 | - $(top_builddir)/simgear/xml/libsgxml.a \ |
342 | - $(top_builddir)/simgear/misc/libsgmisc.a \ | |
184dbcd1 | 343 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
344 | - $(top_builddir)/simgear/structure/libsgstructure.a | |
e26f8204 JK |
345 | +# NOTE: Looped dependencies misc and props test files, commenting this one out |
346 | +# noinst_PROGRAMS = props_test | |
347 | + | |
348 | +# props_test_SOURCES = props_test.cxx | |
349 | +# props_test_LDADD = \ | |
350 | +# libsgprops.la \ | |
351 | +# $(top_builddir)/simgear/xml/libsgxml.la \ | |
352 | +# $(top_builddir)/simgear/misc/libsgmisc.la \ | |
353 | +# $(top_builddir)/simgear/debug/libsgdebug.la \ | |
354 | +# $(top_builddir)/simgear/structure/libsgstructure.la | |
172de490 MM |
355 | |
356 | INCLUDES = -I$(top_srcdir) | |
e26f8204 JK |
357 | diff -uNr SimGear-1.9.1.orig/simgear/route/Makefile.am SimGear-1.9.1/simgear/route/Makefile.am |
358 | --- SimGear-1.9.1.orig/simgear/route/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
359 | +++ SimGear-1.9.1/simgear/route/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
360 | @@ -1,10 +1,10 @@ | |
361 | includedir = @includedir@/route | |
8a000a2b SZ |
362 | |
363 | -lib_LIBRARIES = libsgroute.a | |
364 | +lib_LTLIBRARIES = libsgroute.la | |
365 | ||
366 | include_HEADERS = route.hxx waypoint.hxx | |
367 | ||
368 | -libsgroute_a_SOURCES = \ | |
369 | +libsgroute_la_SOURCES = \ | |
370 | route.cxx \ | |
371 | waypoint.cxx | |
372 | ||
e26f8204 | 373 | @@ -15,21 +15,21 @@ |
8a000a2b SZ |
374 | waytest_SOURCES = waytest.cxx |
375 | ||
376 | waytest_LDADD = \ | |
e26f8204 | 377 | - libsgroute.a \ |
8a000a2b | 378 | - $(top_builddir)/simgear/math/libsgmath.a \ |
172de490 MM |
379 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
380 | - $(top_builddir)/simgear/misc/libsgmisc.a \ | |
e26f8204 JK |
381 | - $(top_builddir)/simgear/props/libsgprops.a \ |
382 | - $(top_builddir)/simgear/structure/libsgstructure.a \ | |
383 | - $(top_builddir)/simgear/xml/libsgxml.a \ | |
384 | + libsgroute.la \ | |
8a000a2b SZ |
385 | + $(top_builddir)/simgear/math/libsgmath.la \ |
386 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
172de490 | 387 | + $(top_builddir)/simgear/misc/libsgmisc.la \ |
11cce033 | 388 | + $(top_builddir)/simgear/props/libsgprops.la \ |
e26f8204 | 389 | + $(top_builddir)/simgear/structure/libsgstructure.la \ |
11cce033 | 390 | + $(top_builddir)/simgear/xml/libsgxml.la \ |
184dbcd1 | 391 | $(base_LIBS) \ |
172de490 | 392 | -lz |
8a000a2b SZ |
393 | |
394 | routetest_SOURCES = routetest.cxx | |
395 | ||
396 | routetest_LDADD = \ | |
e26f8204 | 397 | - libsgroute.a \ |
8a000a2b | 398 | - $(top_builddir)/simgear/math/libsgmath.a \ |
184dbcd1 | 399 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
e26f8204 JK |
400 | - $(top_builddir)/simgear/structure/libsgstructure.a \ |
401 | + libsgroute.la \ | |
8a000a2b | 402 | + $(top_builddir)/simgear/math/libsgmath.la \ |
f15444c2 | 403 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
11cce033 | 404 | + $(top_builddir)/simgear/structure/libsgstructure.la \ |
e26f8204 JK |
405 | $(base_LIBS) |
406 | diff -uNr SimGear-1.9.1.orig/simgear/scene/material/Makefile.am SimGear-1.9.1/simgear/scene/material/Makefile.am | |
407 | --- SimGear-1.9.1.orig/simgear/scene/material/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
408 | +++ SimGear-1.9.1/simgear/scene/material/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
409 | @@ -1,6 +1,6 @@ | |
410 | includedir = @includedir@/scene/material | |
411 | ||
412 | -lib_LIBRARIES = libsgmaterial.a | |
413 | +lib_LTLIBRARIES = libsgmaterial.la | |
414 | ||
415 | noinst_HEADERS = | |
416 | ||
417 | @@ -9,7 +9,7 @@ | |
418 | matlib.hxx \ | |
419 | matmodel.hxx | |
420 | ||
421 | -libsgmaterial_a_SOURCES = \ | |
422 | +libsgmaterial_la_SOURCES = \ | |
423 | mat.cxx \ | |
424 | matlib.cxx \ | |
425 | matmodel.cxx | |
426 | diff -uNr SimGear-1.9.1.orig/simgear/scene/model/Makefile.am SimGear-1.9.1/simgear/scene/model/Makefile.am | |
427 | --- SimGear-1.9.1.orig/simgear/scene/model/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
428 | +++ SimGear-1.9.1/simgear/scene/model/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
429 | @@ -1,6 +1,6 @@ | |
430 | includedir = @includedir@/scene/model | |
431 | ||
432 | -lib_LIBRARIES = libsgmodel.a | |
433 | +lib_LTLIBRARIES = libsgmodel.la | |
434 | ||
435 | noinst_HEADERS = | |
436 | ||
437 | @@ -25,7 +25,7 @@ | |
438 | SGScaleTransform.hxx \ | |
439 | SGTranslateTransform.hxx | |
440 | ||
441 | -libsgmodel_a_SOURCES = \ | |
442 | +libsgmodel_la_SOURCES = \ | |
443 | animation.cxx \ | |
444 | particles.cxx \ | |
445 | location.cxx \ | |
446 | diff -uNr SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am SimGear-1.9.1/simgear/scene/sky/Makefile.am | |
447 | --- SimGear-1.9.1.orig/simgear/scene/sky/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
448 | +++ SimGear-1.9.1/simgear/scene/sky/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
449 | @@ -1,6 +1,6 @@ | |
450 | includedir = @includedir@/scene/sky | |
451 | ||
452 | -lib_LIBRARIES = libsgsky.a | |
453 | +lib_LTLIBRARIES = libsgsky.la | |
454 | ||
455 | include_HEADERS = \ | |
456 | cloud.hxx \ | |
457 | @@ -15,7 +15,7 @@ | |
458 | newcloud.hxx \ | |
459 | CloudShaderGeometry.hxx | |
460 | ||
461 | -libsgsky_a_SOURCES = \ | |
462 | +libsgsky_la_SOURCES = \ | |
463 | cloud.cxx \ | |
464 | dome.cxx \ | |
465 | moon.cxx \ | |
466 | diff -uNr SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am SimGear-1.9.1/simgear/scene/tgdb/Makefile.am | |
467 | --- SimGear-1.9.1.orig/simgear/scene/tgdb/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
468 | +++ SimGear-1.9.1/simgear/scene/tgdb/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
469 | @@ -1,6 +1,6 @@ | |
470 | includedir = @includedir@/scene/tgdb | |
471 | ||
472 | -lib_LIBRARIES = libsgtgdb.a | |
473 | +lib_LTLIBRARIES = libsgtgdb.la | |
474 | ||
475 | noinst_HEADERS = | |
476 | ||
477 | @@ -24,7 +24,7 @@ | |
478 | TileCache.hxx \ | |
479 | TileEntry.hxx | |
480 | ||
481 | -libsgtgdb_a_SOURCES = \ | |
482 | +libsgtgdb_la_SOURCES = \ | |
483 | apt_signs.cxx \ | |
484 | obj.cxx \ | |
485 | pt_lights.cxx \ | |
486 | diff -uNr SimGear-1.9.1.orig/simgear/scene/util/Makefile.am SimGear-1.9.1/simgear/scene/util/Makefile.am | |
487 | --- SimGear-1.9.1.orig/simgear/scene/util/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
488 | +++ SimGear-1.9.1/simgear/scene/util/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
489 | @@ -1,6 +1,6 @@ | |
490 | includedir = @includedir@/scene/util | |
491 | ||
492 | -lib_LIBRARIES = libsgutil.a | |
493 | +lib_LTLIBRARIES = libsgutil.la | |
494 | ||
495 | noinst_HEADERS = | |
496 | ||
497 | @@ -21,7 +21,7 @@ | |
498 | VectorArrayAdapter.hxx | |
499 | ||
500 | ||
501 | -libsgutil_a_SOURCES = \ | |
502 | +libsgutil_la_SOURCES = \ | |
503 | SGEnlargeBoundingBox.cxx \ | |
504 | SGSceneFeatures.cxx \ | |
505 | SGSceneUserData.cxx \ | |
506 | diff -uNr SimGear-1.9.1.orig/simgear/screen/Makefile.am SimGear-1.9.1/simgear/screen/Makefile.am | |
507 | --- SimGear-1.9.1.orig/simgear/screen/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
508 | +++ SimGear-1.9.1/simgear/screen/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
172de490 | 509 | @@ -1,6 +1,6 @@ |
8a000a2b SZ |
510 | includedir = @includedir@/screen |
511 | ||
512 | -lib_LIBRARIES = libsgscreen.a | |
513 | +lib_LTLIBRARIES = libsgscreen.la | |
514 | ||
e2945762 | 515 | EXTRA_DIST = jpgfactory.cxx jpgfactory.hxx |
172de490 | 516 | |
11cce033 MK |
517 | @@ -24,7 +24,7 @@ |
518 | shader.h \ | |
e2945762 | 519 | tr.h |
8a000a2b SZ |
520 | |
521 | -libsgscreen_a_SOURCES = \ | |
522 | +libsgscreen_la_SOURCES = \ | |
e2945762 | 523 | texture.cxx \ |
11cce033 | 524 | GLBitmaps.cxx \ |
172de490 | 525 | $(IMAGE_SERVER_SRCS) \ |
e26f8204 | 526 | @@ -41,8 +41,8 @@ |
11cce033 MK |
527 | TestRenderTexture_SOURCES = TestRenderTexture.cpp |
528 | ||
529 | TestRenderTexture_LDADD = \ | |
e26f8204 | 530 | - libsgscreen.a \ |
11cce033 | 531 | - $(top_builddir)/simgear/debug/libsgdebug.a \ |
e26f8204 | 532 | + libsgscreen.la \ |
11cce033 | 533 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
e26f8204 | 534 | $(opengl_LIBS) |
11cce033 MK |
535 | endif |
536 | ||
e26f8204 JK |
537 | diff -uNr SimGear-1.9.1.orig/simgear/serial/Makefile.am SimGear-1.9.1/simgear/serial/Makefile.am |
538 | --- SimGear-1.9.1.orig/simgear/serial/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
539 | +++ SimGear-1.9.1/simgear/serial/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
f15444c2 SZ |
540 | @@ -1,17 +1,17 @@ |
541 | includedir = @includedir@/serial | |
8a000a2b SZ |
542 | |
543 | -lib_LIBRARIES = libsgserial.a | |
544 | +lib_LTLIBRARIES = libsgserial.la | |
545 | ||
546 | include_HEADERS = serial.hxx | |
547 | ||
548 | -libsgserial_a_SOURCES = serial.cxx | |
549 | +libsgserial_la_SOURCES = serial.cxx | |
550 | ||
f15444c2 SZ |
551 | noinst_PROGRAMS = testserial |
552 | ||
8a000a2b SZ |
553 | testserial_SOURCES = testserial.cxx |
554 | ||
555 | testserial_LDADD = \ | |
e26f8204 | 556 | - libsgserial.a \ |
8a000a2b | 557 | - $(top_builddir)/simgear/debug/libsgdebug.a |
e26f8204 | 558 | + libsgserial.la \ |
8a000a2b SZ |
559 | + $(top_builddir)/simgear/debug/libsgdebug.la |
560 | ||
172de490 | 561 | INCLUDES = -I$(top_srcdir) |
e26f8204 JK |
562 | diff -uNr SimGear-1.9.1.orig/simgear/sound/Makefile.am SimGear-1.9.1/simgear/sound/Makefile.am |
563 | --- SimGear-1.9.1.orig/simgear/sound/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
564 | +++ SimGear-1.9.1/simgear/sound/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
565 | @@ -2,7 +2,7 @@ | |
e2945762 | 566 | |
e26f8204 | 567 | EXTRA_DIST = jet.wav |
11cce033 | 568 | |
e26f8204 JK |
569 | -lib_LIBRARIES = libsgsound.a |
570 | +lib_LTLIBRARIES = libsgsound.la | |
e2945762 | 571 | |
e26f8204 | 572 | noinst_HEADERS = |
11cce033 | 573 | |
e26f8204 JK |
574 | @@ -11,7 +11,7 @@ |
575 | soundmgr_openal.hxx \ | |
576 | xmlsound.hxx | |
184dbcd1 | 577 | |
e26f8204 JK |
578 | -libsgsound_a_SOURCES = \ |
579 | +libsgsound_la_SOURCES = \ | |
580 | sample_openal.cxx \ | |
581 | soundmgr_openal.cxx \ | |
582 | xmlsound.cxx | |
583 | @@ -22,14 +22,14 @@ | |
584 | openal_test2_SOURCES = openal_test2.cxx | |
184dbcd1 | 585 | |
e26f8204 JK |
586 | openal_test1_LDADD = \ |
587 | - $(top_builddir)/simgear/debug/libsgdebug.a \ | |
588 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
589 | $(openal_LIBS) | |
184dbcd1 | 590 | |
e26f8204 JK |
591 | openal_test2_LDADD = \ |
592 | - libsgsound.a \ | |
593 | - $(top_builddir)/simgear/debug/libsgdebug.a \ | |
594 | - $(top_builddir)/simgear/misc/libsgmisc.a \ | |
595 | - $(top_builddir)/simgear/structure/libsgstructure.a \ | |
596 | + libsgsound.la \ | |
597 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
598 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
599 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
600 | $(openal_LIBS) | |
f15444c2 | 601 | |
e26f8204 JK |
602 | INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\" |
603 | diff -uNr SimGear-1.9.1.orig/simgear/structure/Makefile.am SimGear-1.9.1/simgear/structure/Makefile.am | |
604 | --- SimGear-1.9.1.orig/simgear/structure/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
605 | +++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
11cce033 | 606 | @@ -1,6 +1,6 @@ |
e26f8204 | 607 | includedir = @includedir@/structure |
f15444c2 | 608 | |
e26f8204 JK |
609 | -lib_LIBRARIES = libsgstructure.a |
610 | +lib_LTLIBRARIES = libsgstructure.la | |
f15444c2 | 611 | |
e26f8204 JK |
612 | include_HEADERS = \ |
613 | callback.hxx \ | |
614 | @@ -19,7 +19,7 @@ | |
615 | SGSmplstat.hxx \ | |
616 | Singleton.hxx | |
f15444c2 | 617 | |
e26f8204 JK |
618 | -libsgstructure_a_SOURCES = \ |
619 | +libsgstructure_la_SOURCES = \ | |
620 | commands.cxx \ | |
621 | exception.cxx \ | |
622 | event_mgr.cxx\ | |
623 | diff -uNr SimGear-1.9.1.orig/simgear/threads/Makefile.am SimGear-1.9.1/simgear/threads/Makefile.am | |
624 | --- SimGear-1.9.1.orig/simgear/threads/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
625 | +++ SimGear-1.9.1/simgear/threads/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
626 | @@ -1,13 +1,13 @@ | |
627 | includedir = @includedir@/threads | |
11cce033 | 628 | |
e26f8204 JK |
629 | -lib_LIBRARIES = libsgthreads.a |
630 | +lib_LTLIBRARIES = libsgthreads.la | |
8a000a2b | 631 | |
e26f8204 JK |
632 | include_HEADERS = \ |
633 | SGGuard.hxx \ | |
634 | SGQueue.hxx \ | |
635 | SGThread.hxx | |
8a000a2b | 636 | |
e26f8204 JK |
637 | -libsgthreads_a_SOURCES = \ |
638 | +libsgthreads_la_SOURCES = \ | |
639 | SGThread.cxx | |
8a000a2b | 640 | |
e26f8204 JK |
641 | INCLUDES = -I$(top_srcdir) |
642 | diff -uNr SimGear-1.9.1.orig/simgear/timing/Makefile.am SimGear-1.9.1/simgear/timing/Makefile.am | |
643 | --- SimGear-1.9.1.orig/simgear/timing/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
644 | +++ SimGear-1.9.1/simgear/timing/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
645 | @@ -1,6 +1,6 @@ | |
646 | includedir = @includedir@/timing | |
11cce033 | 647 | |
e26f8204 JK |
648 | -lib_LIBRARIES = libsgtiming.a |
649 | +lib_LTLIBRARIES = libsgtiming.la | |
650 | ||
651 | include_HEADERS = \ | |
652 | geocoord.h \ | |
653 | @@ -9,7 +9,7 @@ | |
654 | timestamp.hxx \ | |
655 | timezone.h | |
656 | ||
657 | -libsgtiming_a_SOURCES = \ | |
658 | +libsgtiming_la_SOURCES = \ | |
659 | geocoord.cxx \ | |
660 | lowleveltime.cxx \ | |
661 | sg_time.cxx \ | |
662 | diff -uNr SimGear-1.9.1.orig/simgear/xml/Makefile.am SimGear-1.9.1/simgear/xml/Makefile.am | |
663 | --- SimGear-1.9.1.orig/simgear/xml/Makefile.am 2009-01-25 13:00:32.000000000 +0100 | |
664 | +++ SimGear-1.9.1/simgear/xml/Makefile.am 2009-08-11 14:32:11.000000000 +0200 | |
d00765a8 | 665 | @@ -1,6 +1,6 @@ |
e26f8204 | 666 | includedir = @includedir@/xml |
8a000a2b | 667 | |
e26f8204 JK |
668 | -lib_LIBRARIES = libsgxml.a |
669 | +lib_LTLIBRARIES = libsgxml.la | |
8a000a2b | 670 | |
d00765a8 | 671 | include_HEADERS = \ |
e26f8204 JK |
672 | easyxml.hxx |
673 | @@ -8,7 +8,7 @@ | |
674 | noinst_HEADERS = \ | |
675 | xmltok_impl.c xmltok_ns.c | |
8a000a2b | 676 | |
e26f8204 JK |
677 | -libsgxml_a_SOURCES = \ |
678 | +libsgxml_la_SOURCES = \ | |
679 | asciitab.h \ | |
680 | easyxml.cxx \ | |
681 | hashtable.h hashtable.c \ |