[packages/SimGear.git] / SimGear-shared.patch

--- configure.in~	Sun Apr 21 00:03:48 2002
+++ configure.in	Thu May  9 00:36:15 2002
@@ -33,7 +33,7 @@
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
--- simgear/bucket/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/bucket/Makefile.am	Thu May  9 00:39:33 2002
@@ -1,10 +1,10 @@
 includedir = @includedir@/bucket
 
-lib_LIBRARIES = libsgbucket.a
+lib_LTLIBRARIES = libsgbucket.la
 
 include_HEADERS = newbucket.hxx
 
-libsgbucket_a_SOURCES = newbucket.cxx
+libsgbucket_la_SOURCES = newbucket.cxx
 
 # noinst_PROGRAMS = testbucket
 
--- simgear/debug/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/debug/Makefile.am	Thu May  9 00:40:16 2002
@@ -2,11 +2,11 @@
 
 EXTRA_DIST = logtest.cxx
 
-lib_LIBRARIES = libsgdebug.a
+lib_LTLIBRARIES = libsgdebug.la
 
 include_HEADERS = debug_types.h logstream.hxx
 
-libsgdebug_a_SOURCES = logstream.cxx
+libsgdebug_la_SOURCES = logstream.cxx
 
 INCLUDES = -I$(top_srcdir)
 
--- simgear/ephemeris/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/ephemeris/Makefile.am	Thu May  9 00:41:24 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/ephemeris
 
-lib_LIBRARIES = libsgephem.a
+lib_LTLIBRARIES = libsgephem.la
 
 include_HEADERS = \
 	celestialBody.hxx \
@@ -16,7 +16,7 @@
 	uranus.hxx \
 	venus.hxx
 
-libsgephem_a_SOURCES = \
+libsgephem_la_SOURCES = \
 	celestialBody.cxx \
 	ephemeris.cxx \
 	jupiter.cxx \
--- simgear/io/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/io/Makefile.am	Thu May  9 00:44:11 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/io
 
-lib_LIBRARIES = libsgio.a
+lib_LTLIBRARIES = libsgio.la
 
 include_HEADERS = \
 	iochannel.hxx \
@@ -11,7 +11,7 @@
 	sg_socket.hxx \
 	sg_socket_udp.hxx
 
-libsgio_a_SOURCES = \
+libsgio_la_SOURCES = \
 	iochannel.cxx \
 	lowlevel.cxx \
 	sg_binobj.cxx \
@@ -33,24 +33,32 @@
 socktest_SOURCES = socktest.cxx
 
 socktest_LDADD = \
-	$(top_builddir)/simgear/bucket/libsgbucket.a \
-        $(top_builddir)/simgear/io/libsgio.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
-	-lz
+	$(top_builddir)/simgear/bucket/libsgbucket.la \
+        $(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	-lz -lplibnet
 
 lowtest_SOURCES = lowtest.cxx
 
 lowtest_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.a
+	$(top_builddir)/simgear/io/libsgio.la \
+       $(top_builddir)/simgear/bucket/libsgbucket.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+        $(top_builddir)/simgear/misc/libsgmisc.la \
+       $(top_builddir)/simgear/xml/libsgxml.la \
+	-lz -lplibnet
 
 decode_binobj_SOURCES = decode_binobj.cxx
 
 decode_binobj_LDADD = \
-	$(top_builddir)/simgear/io/libsgio.a \
-        $(top_builddir)/simgear/bucket/libsgbucket.a \
-        $(top_builddir)/simgear/misc/libsgmisc.a \
-        $(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
-	$(NETWORK_LIB) -lz
+	$(top_builddir)/simgear/io/libsgio.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+        $(top_builddir)/simgear/bucket/libsgbucket.la \
+        $(top_builddir)/simgear/misc/libsgmisc.la \
+        $(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+ 	$(NETWORK_LIB) -lz -lplibnet
--- simgear/magvar/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/magvar/Makefile.am	Thu May  9 00:45:27 2002
@@ -1,10 +1,10 @@
 includedir = @includedir@/magvar
 
-lib_LIBRARIES = libsgmagvar.a
+lib_LTLIBRARIES = libsgmagvar.la
 
 include_HEADERS = magvar.hxx
 
-libsgmagvar_a_SOURCES = \
+libsgmagvar_la_SOURCES = \
 	coremag.hxx coremag.cxx \
 	magvar.cxx
 
@@ -12,7 +12,7 @@
 
 testmagvar_SOURCES = testmagvar.cxx
 
-testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
+testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.la
 
 INCLUDES = -I$(top_srcdir)
 
--- simgear/math/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/math/Makefile.am	Thu May  9 00:46:28 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/math
 
-lib_LIBRARIES = libsgmath.a
+lib_LTLIBRARIES = libsgmath.la
 
 include_HEADERS = \
 	interpolater.hxx \
@@ -16,7 +16,7 @@
 
 EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
 
-libsgmath_a_SOURCES = \
+libsgmath_la_SOURCES = \
 	interpolater.cxx \
 	leastsqs.cxx \
 	polar3d.cxx \
--- simgear/metar/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/metar/Makefile.am	Thu May  9 00:47:28 2002
@@ -1,10 +1,10 @@
 includedir = @includedir@/metar
 
-lib_LIBRARIES = libsgmetar.a
+lib_LTLIBRARIES = libsgmetar.la
 
 include_HEADERS = MetarReport.h MetarStation.h 
 
-libsgmetar_a_SOURCES = \
+libsgmetar_la_SOURCES = \
 	Antoi.cpp Charcmp.cpp Dcdmetar.cpp Dcdmtrmk.cpp Drvmetar.c \
 	Fracpart.cpp Local.h Metar.h \
 	MetarReport.cpp \
--- simgear/misc/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/misc/Makefile.am	Thu May  9 00:49:22 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/misc
 
-lib_LIBRARIES = libsgmisc.a
+lib_LTLIBRARIES = libsgmisc.la
 
 include_HEADERS = \
         commands.hxx \
@@ -14,7 +14,7 @@
 	texcoord.hxx \
 	zfstream.hxx
 
-libsgmisc_a_SOURCES = \
+libsgmisc_la_SOURCES = \
         commands.cxx \
         exception.cxx \
 	props.cxx \
@@ -28,7 +28,7 @@
 noinst_PROGRAMS = props_test
 
 props_test_SOURCES = props_test.cxx
-props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
+props_test_LDADD = libsgmisc.la ../xml/libsgxml.la ../debug/libsgdebug.la -lz
 
 INCLUDES = -I$(top_srcdir)
 
--- simgear/route/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/route/Makefile.am	Thu May  9 00:51:04 2002
@@ -1,10 +1,10 @@
 includedir = @includedir@/route
 
-lib_LIBRARIES = libsgroute.a
+lib_LTLIBRARIES = libsgroute.la
 
 include_HEADERS = route.hxx waypoint.hxx
 
-libsgroute_a_SOURCES = \
+libsgroute_la_SOURCES = \
 	route.cxx \
 	waypoint.cxx
 
@@ -15,16 +15,19 @@
 waytest_SOURCES = waytest.cxx
 
 waytest_LDADD = \
-	$(top_builddir)/simgear/route/libsgroute.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a \
-	$(top_builddir)/simgear/misc/libsgmisc.a \
-	$(top_builddir)/simgear/xml/libsgxml.a \
+	$(top_builddir)/simgear/route/libsgroute.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la \
+	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
 	-lz
 
 routetest_SOURCES = routetest.cxx
 
 routetest_LDADD = \
-	$(top_builddir)/simgear/route/libsgroute.a \
-	$(top_builddir)/simgear/math/libsgmath.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a
+	$(top_builddir)/simgear/route/libsgroute.la \
+	$(top_builddir)/simgear/math/libsgmath.la \
+       $(top_builddir)/simgear/misc/libsgmisc.la \
+       $(top_builddir)/simgear/debug/libsgdebug.la \
+       $(top_builddir)/simgear/xml/libsgxml.la \
+	-lz
--- simgear/screen/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/screen/Makefile.am	Thu May  9 00:51:54 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/screen
 
-lib_LIBRARIES = libsgscreen.a
+lib_LTLIBRARIES = libsgscreen.la
 
 if ENABLE_JPEG_SERVER
 IMAGE_SERVER_INCL = jpgfactory.hxx
@@ -12,7 +12,7 @@
 
 include_HEADERS = $(IMAGE_SERVER_INCL) screen-dump.hxx tr.h
 
-libsgscreen_a_SOURCES = \
+libsgscreen_la_SOURCES = \
 	GLBitmaps.cxx GLBitmaps.h \
 	$(IMAGE_SERVER_SRCS) \
 	screen-dump.cxx \
--- simgear/serial/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/serial/Makefile.am	Thu May  9 00:52:55 2002
@@ -2,17 +2,17 @@
 
 noinst_PROGRAMS = testserial
 
-lib_LIBRARIES = libsgserial.a
+lib_LTLIBRARIES = libsgserial.la
 
 include_HEADERS = serial.hxx
 
-libsgserial_a_SOURCES = serial.cxx
+libsgserial_la_SOURCES = serial.cxx
 
 testserial_SOURCES = testserial.cxx
 
 testserial_LDADD = \
-	$(top_builddir)/simgear/serial/libsgserial.a \
-	$(top_builddir)/simgear/debug/libsgdebug.a
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/debug/libsgdebug.la
 
 INCLUDES = -I$(top_srcdir)
 
--- simgear/sky/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/sky/Makefile.am	Thu May  9 00:54:55 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/sky
 
-lib_LIBRARIES = libsgsky.a
+lib_LTLIBRARIES = libsgsky.la
 
 include_HEADERS = \
 	cloud.hxx \
@@ -11,7 +11,7 @@
 	sphere.hxx \
 	stars.hxx
 
-libsgsky_a_SOURCES = \
+libsgsky_la_SOURCES = \
 	cloud.cxx \
 	dome.cxx \
 	moon.cxx \
--- simgear/timing/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/timing/Makefile.am	Thu May  9 00:55:32 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/timing
 
-lib_LIBRARIES = libsgtiming.a
+lib_LTLIBRARIES = libsgtiming.la
 
 include_HEADERS = \
 	geocoord.h \
@@ -9,7 +9,7 @@
 	timestamp.hxx \
 	timezone.h
 
-libsgtiming_a_SOURCES = \
+libsgtiming_la_SOURCES = \
 	geocoord.cxx \
 	lowleveltime.cxx \
 	sg_time.cxx \
--- simgear/xgl/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/xgl/Makefile.am	Thu May  9 00:56:07 2002
@@ -1,10 +1,10 @@
 includedir = @includedir@/xgl
 
-lib_LIBRARIES = libsgxgl.a
+lib_LTLIBRARIES = libsgxgl.la
 
 include_HEADERS = xgl.h
 
-libsgxgl_a_SOURCES = xgl.c xglUtils.c
+libsgxgl_la_SOURCES = xgl.c xglUtils.c
 
 INCLUDES = -I$(top_srcdir)
 
--- simgear/xml/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/xml/Makefile.am	Thu May  9 00:56:39 2002
@@ -1,6 +1,6 @@
 includedir = @includedir@/xml
 
-lib_LIBRARIES = libsgxml.a
+lib_LTLIBRARIES = libsgxml.la
 
 include_HEADERS = \
 	easyxml.hxx
@@ -8,7 +8,7 @@
 noinst_HEADERS = \
 	xmltok_impl.c xmltok_ns.c
 
-libsgxml_a_SOURCES = \
+libsgxml_la_SOURCES = \
         asciitab.h \
 	easyxml.cxx \
 	hashtable.h hashtable.c \
--- simgear/threads/Makefile.am~	Thu May  9 00:35:01 2002
+++ simgear/threads/Makefile.am	Thu May  9 00:57:41 2002
@@ -1,13 +1,13 @@
 includedir = @includedir@/threads
 
-lib_LIBRARIES = libsgthreads.a
+lib_LTLIBRARIES = libsgthreads.la
 
 include_HEADERS = \
 	SGGuard.hxx \
 	SGQueue.hxx \
 	SGThread.hxx
 
-libsgthreads_a_SOURCES = \
+libsgthreads_la_SOURCES = \
 	SGThread.cxx
 
 INCLUDES = -I$(top_srcdir)

--- simgear/Makefile.am~	Sat Dec 29 01:37:03 2001
+++ simgear/Makefile.am	Thu May  9 02:36:08 2002
@@ -24,13 +24,13 @@
 	misc \
 	bucket \
 	ephemeris \
+	$(SERIAL_DIRS) \
 	io \
 	magvar \
 	math \
 	$(METAR_DIRS) \
 	route \
 	screen \
-	$(SERIAL_DIRS) \
 	sky \
 	$(SGTHREAD_DIR) \
 	timing \
Commit	Line	Data
172de490 MM	1	--- configure.in~ Sun Apr 21 00:03:48 2002
	2	+++ configure.in Thu May 9 00:36:15 2002
	3	@@ -33,7 +33,7 @@
8a000a2b	4	AC_PROG_CC
172de490	5	AC_PROG_CPP
8a000a2b SZ	6	AC_PROG_CXX
8a000a2b SZ	7	-AC_PROG_RANLIB
172de490	8	+AC_PROG_LIBTOOL
8a000a2b SZ	9	AC_PROG_INSTALL
	10	AC_PROG_LN_S
	11
172de490 MM	12	--- simgear/bucket/Makefile.am~ Thu May 9 00:35:01 2002
172de490 MM	13	+++ simgear/bucket/Makefile.am Thu May 9 00:39:33 2002
8a000a2b SZ	14	@@ -1,10 +1,10 @@
	15	includedir = @includedir@/bucket
	16
	17	-lib_LIBRARIES = libsgbucket.a
	18	+lib_LTLIBRARIES = libsgbucket.la
	19
	20	include_HEADERS = newbucket.hxx
	21
	22	-libsgbucket_a_SOURCES = newbucket.cxx
	23	+libsgbucket_la_SOURCES = newbucket.cxx
	24
	25	# noinst_PROGRAMS = testbucket
	26
172de490 MM	27	--- simgear/debug/Makefile.am~ Thu May 9 00:35:01 2002
	28	+++ simgear/debug/Makefile.am Thu May 9 00:40:16 2002
	29	@@ -2,11 +2,11 @@
8a000a2b SZ	30
	31	EXTRA_DIST = logtest.cxx
	32
	33	-lib_LIBRARIES = libsgdebug.a
	34	+lib_LTLIBRARIES = libsgdebug.la
	35
	36	include_HEADERS = debug_types.h logstream.hxx
	37
	38	-libsgdebug_a_SOURCES = logstream.cxx
	39	+libsgdebug_la_SOURCES = logstream.cxx
	40
172de490 MM	41	INCLUDES = -I$(top_srcdir)
	42
	43	--- simgear/ephemeris/Makefile.am~ Thu May 9 00:35:01 2002
	44	+++ simgear/ephemeris/Makefile.am Thu May 9 00:41:24 2002
8a000a2b SZ	45	@@ -1,6 +1,6 @@
	46	includedir = @includedir@/ephemeris
	47
	48	-lib_LIBRARIES = libsgephem.a
	49	+lib_LTLIBRARIES = libsgephem.la
	50
	51	include_HEADERS = \
	52	celestialBody.hxx \
	53	@@ -16,7 +16,7 @@
	54	uranus.hxx \
	55	venus.hxx
	56
	57	-libsgephem_a_SOURCES = \
	58	+libsgephem_la_SOURCES = \
	59	celestialBody.cxx \
	60	ephemeris.cxx \
	61	jupiter.cxx \
172de490 MM	62	--- simgear/io/Makefile.am~ Thu May 9 00:35:01 2002
172de490 MM	63	+++ simgear/io/Makefile.am Thu May 9 00:44:11 2002
8a000a2b SZ	64	@@ -1,6 +1,6 @@
	65	includedir = @includedir@/io
	66
	67	-lib_LIBRARIES = libsgio.a
	68	+lib_LTLIBRARIES = libsgio.la
	69
	70	include_HEADERS = \
	71	iochannel.hxx \
172de490 MM	72	@@ -11,7 +11,7 @@
	73	sg_socket.hxx \
	74	sg_socket_udp.hxx
8a000a2b SZ	75
	76	-libsgio_a_SOURCES = \
	77	+libsgio_la_SOURCES = \
	78	iochannel.cxx \
172de490 MM	79	lowlevel.cxx \
	80	sg_binobj.cxx \
	81	@@ -33,24 +33,32 @@
8a000a2b SZ	82	socktest_SOURCES = socktest.cxx
	83
	84	socktest_LDADD = \
172de490 MM	85	- $(top_builddir)/simgear/bucket/libsgbucket.a \
	86	- $(top_builddir)/simgear/io/libsgio.a \
	87	- $(top_builddir)/simgear/debug/libsgdebug.a \
	88	- $(top_builddir)/simgear/misc/libsgmisc.a \
	89	- $(top_builddir)/simgear/xml/libsgxml.a \
	90	- -lz
	91	+ $(top_builddir)/simgear/bucket/libsgbucket.la \
	92	+ $(top_builddir)/simgear/io/libsgio.la \
	93	+ $(top_builddir)/simgear/debug/libsgdebug.la \
	94	+ $(top_builddir)/simgear/serial/libsgserial.la \
	95	+ $(top_builddir)/simgear/misc/libsgmisc.la \
	96	+ $(top_builddir)/simgear/xml/libsgxml.la \
	97	+ -lz -lplibnet
	98
	99	lowtest_SOURCES = lowtest.cxx
	100
	101	lowtest_LDADD = \
	102	- $(top_builddir)/simgear/io/libsgio.a
8a000a2b	103	+ $(top_builddir)/simgear/io/libsgio.la \
172de490 MM	104	+ $(top_builddir)/simgear/bucket/libsgbucket.la \
172de490 MM	105	+ $(top_builddir)/simgear/serial/libsgserial.la \
8a000a2b	106	+ $(top_builddir)/simgear/debug/libsgdebug.la \
172de490 MM	107	+ $(top_builddir)/simgear/misc/libsgmisc.la \
	108	+ $(top_builddir)/simgear/xml/libsgxml.la \
	109	+ -lz -lplibnet
	110
	111	decode_binobj_SOURCES = decode_binobj.cxx
	112
	113	decode_binobj_LDADD = \
	114	- $(top_builddir)/simgear/io/libsgio.a \
	115	- $(top_builddir)/simgear/bucket/libsgbucket.a \
	116	- $(top_builddir)/simgear/misc/libsgmisc.a \
	117	- $(top_builddir)/simgear/debug/libsgdebug.a \
	118	- $(top_builddir)/simgear/xml/libsgxml.a \
	119	- $(NETWORK_LIB) -lz
	120	+ $(top_builddir)/simgear/io/libsgio.la \
	121	+ $(top_builddir)/simgear/serial/libsgserial.la \
	122	+ $(top_builddir)/simgear/bucket/libsgbucket.la \
	123	+ $(top_builddir)/simgear/misc/libsgmisc.la \
	124	+ $(top_builddir)/simgear/debug/libsgdebug.la \
	125	+ $(top_builddir)/simgear/xml/libsgxml.la \
	126	+ $(NETWORK_LIB) -lz -lplibnet
	127	--- simgear/magvar/Makefile.am~ Thu May 9 00:35:01 2002
	128	+++ simgear/magvar/Makefile.am Thu May 9 00:45:27 2002
8a000a2b SZ	129	@@ -1,10 +1,10 @@
	130	includedir = @includedir@/magvar
	131
	132	-lib_LIBRARIES = libsgmagvar.a
	133	+lib_LTLIBRARIES = libsgmagvar.la
	134
	135	include_HEADERS = magvar.hxx
	136
	137	-libsgmagvar_a_SOURCES = \
	138	+libsgmagvar_la_SOURCES = \
	139	coremag.hxx coremag.cxx \
	140	magvar.cxx
	141
172de490	142	@@ -12,7 +12,7 @@
8a000a2b SZ	143
	144	testmagvar_SOURCES = testmagvar.cxx
	145
	146	-testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
	147	+testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.la
	148
172de490 MM	149	INCLUDES = -I$(top_srcdir)
	150
	151	--- simgear/math/Makefile.am~ Thu May 9 00:35:01 2002
	152	+++ simgear/math/Makefile.am Thu May 9 00:46:28 2002
	153	@@ -1,6 +1,6 @@
	154	includedir = @includedir@/math
8a000a2b SZ	155
	156	-lib_LIBRARIES = libsgmath.a
	157	+lib_LTLIBRARIES = libsgmath.la
	158
	159	include_HEADERS = \
172de490 MM	160	interpolater.hxx \
172de490 MM	161	@@ -16,7 +16,7 @@
8a000a2b SZ	162
	163	EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
	164
	165	-libsgmath_a_SOURCES = \
	166	+libsgmath_la_SOURCES = \
	167	interpolater.cxx \
	168	leastsqs.cxx \
	169	polar3d.cxx \
172de490 MM	170	--- simgear/metar/Makefile.am~ Thu May 9 00:35:01 2002
	171	+++ simgear/metar/Makefile.am Thu May 9 00:47:28 2002
	172	@@ -1,10 +1,10 @@
8a000a2b SZ	173	includedir = @includedir@/metar
	174
	175	-lib_LIBRARIES = libsgmetar.a
	176	+lib_LTLIBRARIES = libsgmetar.la
	177
172de490 MM	178	include_HEADERS = MetarReport.h MetarStation.h
172de490 MM	179
8a000a2b SZ	180	-libsgmetar_a_SOURCES = \
	181	+libsgmetar_la_SOURCES = \
	182	Antoi.cpp Charcmp.cpp Dcdmetar.cpp Dcdmtrmk.cpp Drvmetar.c \
	183	Fracpart.cpp Local.h Metar.h \
172de490 MM	184	MetarReport.cpp \
	185	--- simgear/misc/Makefile.am~ Thu May 9 00:35:01 2002
	186	+++ simgear/misc/Makefile.am Thu May 9 00:49:22 2002
	187	@@ -1,6 +1,6 @@
	188	includedir = @includedir@/misc
8a000a2b SZ	189
	190	-lib_LIBRARIES = libsgmisc.a
	191	+lib_LTLIBRARIES = libsgmisc.la
	192
	193	include_HEADERS = \
172de490 MM	194	commands.hxx \
172de490 MM	195	@@ -14,7 +14,7 @@
8a000a2b SZ	196	texcoord.hxx \
	197	zfstream.hxx
	198
	199	-libsgmisc_a_SOURCES = \
	200	+libsgmisc_la_SOURCES = \
172de490 MM	201	commands.cxx \
172de490 MM	202	exception.cxx \
8a000a2b	203	props.cxx \
172de490 MM	204	@@ -28,7 +28,7 @@
	205	noinst_PROGRAMS = props_test
	206
	207	props_test_SOURCES = props_test.cxx
	208	-props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
	209	+props_test_LDADD = libsgmisc.la ../xml/libsgxml.la ../debug/libsgdebug.la -lz
	210
	211	INCLUDES = -I$(top_srcdir)
	212
	213	--- simgear/route/Makefile.am~ Thu May 9 00:35:01 2002
	214	+++ simgear/route/Makefile.am Thu May 9 00:51:04 2002
8a000a2b SZ	215	@@ -1,10 +1,10 @@
	216	includedir = @includedir@/route
	217
	218	-lib_LIBRARIES = libsgroute.a
	219	+lib_LTLIBRARIES = libsgroute.la
	220
	221	include_HEADERS = route.hxx waypoint.hxx
	222
	223	-libsgroute_a_SOURCES = \
	224	+libsgroute_la_SOURCES = \
	225	route.cxx \
	226	waypoint.cxx
	227
172de490	228	@@ -15,16 +15,19 @@
8a000a2b SZ	229	waytest_SOURCES = waytest.cxx
	230
	231	waytest_LDADD = \
	232	- $(top_builddir)/simgear/route/libsgroute.a \
	233	- $(top_builddir)/simgear/math/libsgmath.a \
172de490 MM	234	- $(top_builddir)/simgear/debug/libsgdebug.a \
	235	- $(top_builddir)/simgear/misc/libsgmisc.a \
	236	- $(top_builddir)/simgear/xml/libsgxml.a \
8a000a2b SZ	237	+ $(top_builddir)/simgear/route/libsgroute.la \
	238	+ $(top_builddir)/simgear/math/libsgmath.la \
	239	+ $(top_builddir)/simgear/debug/libsgdebug.la \
172de490 MM	240	+ $(top_builddir)/simgear/misc/libsgmisc.la \
	241	+ $(top_builddir)/simgear/xml/libsgxml.la \
	242	-lz
8a000a2b SZ	243
	244	routetest_SOURCES = routetest.cxx
	245
	246	routetest_LDADD = \
	247	- $(top_builddir)/simgear/route/libsgroute.a \
	248	- $(top_builddir)/simgear/math/libsgmath.a \
	249	- $(top_builddir)/simgear/debug/libsgdebug.a
8a000a2b SZ	250	+ $(top_builddir)/simgear/route/libsgroute.la \
8a000a2b SZ	251	+ $(top_builddir)/simgear/math/libsgmath.la \
172de490 MM	252	+ $(top_builddir)/simgear/misc/libsgmisc.la \
	253	+ $(top_builddir)/simgear/debug/libsgdebug.la \
	254	+ $(top_builddir)/simgear/xml/libsgxml.la \
	255	+ -lz
	256	--- simgear/screen/Makefile.am~ Thu May 9 00:35:01 2002
	257	+++ simgear/screen/Makefile.am Thu May 9 00:51:54 2002
	258	@@ -1,6 +1,6 @@
8a000a2b SZ	259	includedir = @includedir@/screen
	260
	261	-lib_LIBRARIES = libsgscreen.a
	262	+lib_LTLIBRARIES = libsgscreen.la
	263
172de490 MM	264	if ENABLE_JPEG_SERVER
	265	IMAGE_SERVER_INCL = jpgfactory.hxx
	266	@@ -12,7 +12,7 @@
	267
	268	include_HEADERS = $(IMAGE_SERVER_INCL) screen-dump.hxx tr.h
8a000a2b SZ	269
	270	-libsgscreen_a_SOURCES = \
	271	+libsgscreen_la_SOURCES = \
	272	GLBitmaps.cxx GLBitmaps.h \
172de490	273	$(IMAGE_SERVER_SRCS) \
8a000a2b	274	screen-dump.cxx \
172de490 MM	275	--- simgear/serial/Makefile.am~ Thu May 9 00:35:01 2002
	276	+++ simgear/serial/Makefile.am Thu May 9 00:52:55 2002
	277	@@ -2,17 +2,17 @@
8a000a2b SZ	278
	279	noinst_PROGRAMS = testserial
	280
	281	-lib_LIBRARIES = libsgserial.a
	282	+lib_LTLIBRARIES = libsgserial.la
	283
	284	include_HEADERS = serial.hxx
	285
	286	-libsgserial_a_SOURCES = serial.cxx
	287	+libsgserial_la_SOURCES = serial.cxx
	288
	289	testserial_SOURCES = testserial.cxx
	290
	291	testserial_LDADD = \
	292	- $(top_builddir)/simgear/serial/libsgserial.a \
	293	- $(top_builddir)/simgear/debug/libsgdebug.a
	294	+ $(top_builddir)/simgear/serial/libsgserial.la \
	295	+ $(top_builddir)/simgear/debug/libsgdebug.la
	296
172de490 MM	297	INCLUDES = -I$(top_srcdir)
	298
	299	--- simgear/sky/Makefile.am~ Thu May 9 00:35:01 2002
	300	+++ simgear/sky/Makefile.am Thu May 9 00:54:55 2002
8a000a2b SZ	301	@@ -1,6 +1,6 @@
	302	includedir = @includedir@/sky
	303
	304	-lib_LIBRARIES = libsgsky.a
	305	+lib_LTLIBRARIES = libsgsky.la
	306
	307	include_HEADERS = \
	308	cloud.hxx \
	309	@@ -11,7 +11,7 @@
	310	sphere.hxx \
	311	stars.hxx
	312
	313	-libsgsky_a_SOURCES = \
	314	+libsgsky_la_SOURCES = \
	315	cloud.cxx \
	316	dome.cxx \
	317	moon.cxx \
172de490 MM	318	--- simgear/timing/Makefile.am~ Thu May 9 00:35:01 2002
172de490 MM	319	+++ simgear/timing/Makefile.am Thu May 9 00:55:32 2002
8a000a2b SZ	320	@@ -1,6 +1,6 @@
	321	includedir = @includedir@/timing
	322
	323	-lib_LIBRARIES = libsgtiming.a
	324	+lib_LTLIBRARIES = libsgtiming.la
	325
	326	include_HEADERS = \
	327	geocoord.h \
	328	@@ -9,7 +9,7 @@
	329	timestamp.hxx \
	330	timezone.h
	331
	332	-libsgtiming_a_SOURCES = \
	333	+libsgtiming_la_SOURCES = \
	334	geocoord.cxx \
	335	lowleveltime.cxx \
	336	sg_time.cxx \
172de490 MM	337	--- simgear/xgl/Makefile.am~ Thu May 9 00:35:01 2002
	338	+++ simgear/xgl/Makefile.am Thu May 9 00:56:07 2002
	339	@@ -1,10 +1,10 @@
8a000a2b SZ	340	includedir = @includedir@/xgl
	341
	342	-lib_LIBRARIES = libsgxgl.a
	343	+lib_LTLIBRARIES = libsgxgl.la
	344
	345	include_HEADERS = xgl.h
	346
	347	-libsgxgl_a_SOURCES = xgl.c xglUtils.c
	348	+libsgxgl_la_SOURCES = xgl.c xglUtils.c
	349
172de490 MM	350	INCLUDES = -I$(top_srcdir)
	351
	352	--- simgear/xml/Makefile.am~ Thu May 9 00:35:01 2002
	353	+++ simgear/xml/Makefile.am Thu May 9 00:56:39 2002
	354	@@ -1,6 +1,6 @@
	355	includedir = @includedir@/xml
8a000a2b SZ	356
	357	-lib_LIBRARIES = libsgxml.a
	358	+lib_LTLIBRARIES = libsgxml.la
	359
	360	include_HEADERS = \
	361	easyxml.hxx
172de490	362	@@ -8,7 +8,7 @@
8a000a2b SZ	363	noinst_HEADERS = \
	364	xmltok_impl.c xmltok_ns.c
	365
	366	-libsgxml_a_SOURCES = \
	367	+libsgxml_la_SOURCES = \
	368	asciitab.h \
	369	easyxml.cxx \
	370	hashtable.h hashtable.c \
172de490 MM	371	--- simgear/threads/Makefile.am~ Thu May 9 00:35:01 2002
	372	+++ simgear/threads/Makefile.am Thu May 9 00:57:41 2002
	373	@@ -1,13 +1,13 @@
	374	includedir = @includedir@/threads
	375
	376	-lib_LIBRARIES = libsgthreads.a
	377	+lib_LTLIBRARIES = libsgthreads.la
	378
	379	include_HEADERS = \
	380	SGGuard.hxx \
	381	SGQueue.hxx \
	382	SGThread.hxx
	383
	384	-libsgthreads_a_SOURCES = \
	385	+libsgthreads_la_SOURCES = \
	386	SGThread.cxx
	387
	388	INCLUDES = -I$(top_srcdir)
	389
	390	--- simgear/Makefile.am~ Sat Dec 29 01:37:03 2001
	391	+++ simgear/Makefile.am Thu May 9 02:36:08 2002
	392	@@ -24,13 +24,13 @@
	393	misc \
8a000a2b	394	bucket \
8a000a2b SZ	395	ephemeris \
	396	+ $(SERIAL_DIRS) \
	397	io \
	398	magvar \
	399	math \
	400	$(METAR_DIRS) \
8a000a2b SZ	401	route \
	402	screen \
	403	- $(SERIAL_DIRS) \
	404	sky \
172de490	405	$(SGTHREAD_DIR) \
8a000a2b	406	timing \