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