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