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

diff -Naur SimGear-0.3.5/simgear/misc/Makefile.am SimGear-0.3.5-p/simgear/misc/Makefile.am
--- SimGear-0.3.5/simgear/misc/Makefile.am	Mon Mar 29 12:18:56 2004
+++ SimGear-0.3.5-p/simgear/misc/Makefile.am	Mon Mar 29 12:19:35 2004
@@ -30,6 +30,7 @@
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/structure/libsgstructure.la \
 	$(top_builddir)/simgear/timing/libsgtiming.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
 	-lz
 
 INCLUDES = -I$(top_srcdir)
diff -Naur SimGear-0.3.5/simgear/props/Makefile.am SimGear-0.3.5-p/simgear/props/Makefile.am
--- SimGear-0.3.5/simgear/props/Makefile.am	Mon Mar 29 12:29:11 2004
+++ SimGear-0.3.5-p/simgear/props/Makefile.am	Mon Mar 29 12:30:07 2004
@@ -12,16 +12,16 @@
 	props.cxx \
 	props_io.cxx
 
-noinst_PROGRAMS = props_test
+#noinst_PROGRAMS = props_test
 
-props_test_SOURCES = props_test.cxx
-props_test_LDADD = \
-	$(top_builddir)/simgear/props/libsgprops.la \
-	$(top_builddir)/simgear/xml/libsgxml.la \
-	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(top_builddir)/simgear/debug/libsgdebug.la \
-	$(top_builddir)/simgear/structure/libsgstructure.la \
-	$(top_builddir)/simgear/timing/libsgtiming.la \
-	-lz
+#props_test_SOURCES = props_test.cxx
+#props_test_LDADD = \
+#	$(top_builddir)/simgear/props/libsgprops.la \
+#	$(top_builddir)/simgear/xml/libsgxml.la \
+#	$(top_builddir)/simgear/misc/libsgmisc.la \
+#	$(top_builddir)/simgear/debug/libsgdebug.la \
+#	$(top_builddir)/simgear/structure/libsgstructure.la \
+#	$(top_builddir)/simgear/timing/libsgtiming.la \
+#	-lz
 
 INCLUDES = -I$(top_srcdir)
diff -Naur SimGear-0.3.5/simgear/io/Makefile.am SimGear-0.3.5-p/simgear/io/Makefile.am
--- SimGear-0.3.5/simgear/io/Makefile.am	Mon Mar 29 12:35:41 2004
+++ SimGear-0.3.5-p/simgear/io/Makefile.am	Mon Mar 29 12:36:50 2004
@@ -75,4 +75,5 @@
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/bucket/libsgbucket.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
 	$(base_LIBS) -lz
diff -Naur SimGear-0.3.5/simgear/io/Makefile.am SimGear-0.3.5-p/simgear/io/Makefile.am
--- SimGear-0.3.5/simgear/io/Makefile.am	Mon Mar 29 12:58:11 2004
+++ SimGear-0.3.5-p/simgear/io/Makefile.am	Mon Mar 29 12:52:26 2004
@@ -32,6 +32,9 @@
 	$(top_builddir)/simgear/bucket/libsgbucket.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
 	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
 	-lplibnet -lplibul -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
@@ -44,6 +47,9 @@
 	$(top_builddir)/simgear/bucket/libsgbucket.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
 	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
 	-lplibnet -lplibul -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
@@ -55,6 +61,10 @@
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/bucket/libsgbucket.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
 	-lplibnet -lplibul -lz \
 	$(network_LIBS) \
 	$(base_LIBS)
@@ -66,7 +76,11 @@
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/bucket/libsgbucket.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
-	$(base_LIBS) -lz
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/serial/libsgserial.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(base_LIBS) -lz -lplibnet -lplibul
 
 decode_binobj_SOURCES = decode_binobj.cxx
 
@@ -76,4 +90,7 @@
 	$(top_builddir)/simgear/bucket/libsgbucket.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
 	$(top_builddir)/simgear/serial/libsgserial.la \
-	$(base_LIBS) -lz
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(base_LIBS) -lz -lplibnet -lplibul
diff -Naur SimGear-0.3.5/simgear/route/Makefile.am SimGear-0.3.5-p/simgear/route/Makefile.am
--- SimGear-0.3.5/simgear/route/Makefile.am	Mon Mar 29 12:58:11 2004
+++ SimGear-0.3.5-p/simgear/route/Makefile.am	Mon Mar 29 12:54:07 2004
@@ -19,6 +19,9 @@
 	$(top_builddir)/simgear/math/libsgmath.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
 	$(base_LIBS) \
 	-lz
 
@@ -29,5 +32,8 @@
 	$(top_builddir)/simgear/math/libsgmath.la \
 	$(top_builddir)/simgear/debug/libsgdebug.la \
 	$(top_builddir)/simgear/misc/libsgmisc.la \
+	$(top_builddir)/simgear/props/libsgprops.la \
+	$(top_builddir)/simgear/xml/libsgxml.la \
+	$(top_builddir)/simgear/structure/libsgstructure.la \
 	-lz
 	$(base_LIBS)
--- SimGear-0.3.9.old/simgear/Makefile.am	2005-12-07 19:31:45.000000000 +0100
+++ SimGear-0.3.9/simgear/Makefile.am	2005-12-07 20:52:26.000000000 +0100
@@ -16,8 +16,11 @@
 	$(compatibility_DIR) \
 	xml \
 	debug \
-	misc \
+	props \
+	serial \
 	structure \
+	timing \
+	misc \
 	bucket \
 	ephemeris \
 	io \
@@ -25,13 +28,10 @@
 	math \
 	$(METAR_DIRS) \
 	nasal \
-	props \
 	route \
 	scene \
 	screen \
-	serial \
 	sound \
-	$(SGTHREAD_DIR) \
-	timing
+	$(SGTHREAD_DIR)
 
 DIST_SUBDIRS = $(SUBDIRS) compatibility threads
Commit	Line	Data
d915e359 SZ	1	diff -Naur SimGear-0.3.5/simgear/misc/Makefile.am SimGear-0.3.5-p/simgear/misc/Makefile.am
	2	--- SimGear-0.3.5/simgear/misc/Makefile.am Mon Mar 29 12:18:56 2004
	3	+++ SimGear-0.3.5-p/simgear/misc/Makefile.am Mon Mar 29 12:19:35 2004
	4	@@ -30,6 +30,7 @@
	5	$(top_builddir)/simgear/debug/libsgdebug.la \
	6	$(top_builddir)/simgear/structure/libsgstructure.la \
	7	$(top_builddir)/simgear/timing/libsgtiming.la \
	8	+ $(top_builddir)/simgear/props/libsgprops.la \
	9	-lz
	10
	11	INCLUDES = -I$(top_srcdir)
d915e359 SZ	12	diff -Naur SimGear-0.3.5/simgear/props/Makefile.am SimGear-0.3.5-p/simgear/props/Makefile.am
	13	--- SimGear-0.3.5/simgear/props/Makefile.am Mon Mar 29 12:29:11 2004
	14	+++ SimGear-0.3.5-p/simgear/props/Makefile.am Mon Mar 29 12:30:07 2004
	15	@@ -12,16 +12,16 @@
	16	props.cxx \
	17	props_io.cxx
	18
	19	-noinst_PROGRAMS = props_test
	20	+#noinst_PROGRAMS = props_test
	21
	22	-props_test_SOURCES = props_test.cxx
	23	-props_test_LDADD = \
	24	- $(top_builddir)/simgear/props/libsgprops.la \
	25	- $(top_builddir)/simgear/xml/libsgxml.la \
	26	- $(top_builddir)/simgear/misc/libsgmisc.la \
	27	- $(top_builddir)/simgear/debug/libsgdebug.la \
	28	- $(top_builddir)/simgear/structure/libsgstructure.la \
	29	- $(top_builddir)/simgear/timing/libsgtiming.la \
	30	- -lz
	31	+#props_test_SOURCES = props_test.cxx
	32	+#props_test_LDADD = \
	33	+# $(top_builddir)/simgear/props/libsgprops.la \
	34	+# $(top_builddir)/simgear/xml/libsgxml.la \
	35	+# $(top_builddir)/simgear/misc/libsgmisc.la \
	36	+# $(top_builddir)/simgear/debug/libsgdebug.la \
	37	+# $(top_builddir)/simgear/structure/libsgstructure.la \
	38	+# $(top_builddir)/simgear/timing/libsgtiming.la \
	39	+# -lz
	40
	41	INCLUDES = -I$(top_srcdir)
	42	diff -Naur SimGear-0.3.5/simgear/io/Makefile.am SimGear-0.3.5-p/simgear/io/Makefile.am
	43	--- SimGear-0.3.5/simgear/io/Makefile.am Mon Mar 29 12:35:41 2004
	44	+++ SimGear-0.3.5-p/simgear/io/Makefile.am Mon Mar 29 12:36:50 2004
	45	@@ -75,4 +75,5 @@
	46	$(top_builddir)/simgear/debug/libsgdebug.la \
	47	$(top_builddir)/simgear/bucket/libsgbucket.la \
	48	$(top_builddir)/simgear/misc/libsgmisc.la \
	49	+ $(top_builddir)/simgear/serial/libsgserial.la \
	50	$(base_LIBS) -lz
	51	diff -Naur SimGear-0.3.5/simgear/io/Makefile.am SimGear-0.3.5-p/simgear/io/Makefile.am
	52	--- SimGear-0.3.5/simgear/io/Makefile.am Mon Mar 29 12:58:11 2004
	53	+++ SimGear-0.3.5-p/simgear/io/Makefile.am Mon Mar 29 12:52:26 2004
	54	@@ -32,6 +32,9 @@
	55	$(top_builddir)/simgear/bucket/libsgbucket.la \
	56	$(top_builddir)/simgear/misc/libsgmisc.la \
	57	$(top_builddir)/simgear/serial/libsgserial.la \
	58	+ $(top_builddir)/simgear/props/libsgprops.la \
	59	+ $(top_builddir)/simgear/xml/libsgxml.la \
	60	+ $(top_builddir)/simgear/structure/libsgstructure.la \
	61	-lplibnet -lplibul -lz \
	62	$(network_LIBS) \
	63	$(base_LIBS)
	64	@@ -44,6 +47,9 @@
	65	$(top_builddir)/simgear/bucket/libsgbucket.la \
	66	$(top_builddir)/simgear/misc/libsgmisc.la \
	67	$(top_builddir)/simgear/serial/libsgserial.la \
	68	+ $(top_builddir)/simgear/props/libsgprops.la \
	69	+ $(top_builddir)/simgear/xml/libsgxml.la \
	70	+ $(top_builddir)/simgear/structure/libsgstructure.la \
	71	-lplibnet -lplibul -lz \
	72	$(network_LIBS) \
	73	$(base_LIBS)
	74	@@ -55,6 +61,10 @@
	75	$(top_builddir)/simgear/debug/libsgdebug.la \
76	$(top_builddir)/simgear/bucket/libsgbucket.la \
77	$(top_builddir)/simgear/misc/libsgmisc.la \
78	+ $(top_builddir)/simgear/props/libsgprops.la \
79	+ $(top_builddir)/simgear/xml/libsgxml.la \
80	+ $(top_builddir)/simgear/serial/libsgserial.la \
81	+ $(top_builddir)/simgear/structure/libsgstructure.la \
82	-lplibnet -lplibul -lz \
83	$(network_LIBS) \
84	$(base_LIBS)
85	@@ -66,7 +76,11 @@
86	$(top_builddir)/simgear/debug/libsgdebug.la \
87	$(top_builddir)/simgear/bucket/libsgbucket.la \
88	$(top_builddir)/simgear/misc/libsgmisc.la \
89	- $(base_LIBS) -lz
90	+ $(top_builddir)/simgear/props/libsgprops.la \
91	+ $(top_builddir)/simgear/xml/libsgxml.la \
92	+ $(top_builddir)/simgear/serial/libsgserial.la \
93	+ $(top_builddir)/simgear/structure/libsgstructure.la \
94	+ $(base_LIBS) -lz -lplibnet -lplibul
95
96	decode_binobj_SOURCES = decode_binobj.cxx
97
98	@@ -76,4 +90,7 @@
99	$(top_builddir)/simgear/bucket/libsgbucket.la \
100	$(top_builddir)/simgear/misc/libsgmisc.la \
101	$(top_builddir)/simgear/serial/libsgserial.la \
102	- $(base_LIBS) -lz
103	+ $(top_builddir)/simgear/props/libsgprops.la \
104	+ $(top_builddir)/simgear/structure/libsgstructure.la \
105	+ $(top_builddir)/simgear/xml/libsgxml.la \
106	+ $(base_LIBS) -lz -lplibnet -lplibul
107	diff -Naur SimGear-0.3.5/simgear/route/Makefile.am SimGear-0.3.5-p/simgear/route/Makefile.am
108	--- SimGear-0.3.5/simgear/route/Makefile.am Mon Mar 29 12:58:11 2004
109	+++ SimGear-0.3.5-p/simgear/route/Makefile.am Mon Mar 29 12:54:07 2004
110	@@ -19,6 +19,9 @@
111	$(top_builddir)/simgear/math/libsgmath.la \
112	$(top_builddir)/simgear/debug/libsgdebug.la \
113	$(top_builddir)/simgear/misc/libsgmisc.la \
114	+ $(top_builddir)/simgear/props/libsgprops.la \
115	+ $(top_builddir)/simgear/xml/libsgxml.la \
116	+ $(top_builddir)/simgear/structure/libsgstructure.la \
117	$(base_LIBS) \
118	-lz
119
120	@@ -29,5 +32,8 @@
121	$(top_builddir)/simgear/math/libsgmath.la \
122	$(top_builddir)/simgear/debug/libsgdebug.la \
123	$(top_builddir)/simgear/misc/libsgmisc.la \
124	+ $(top_builddir)/simgear/props/libsgprops.la \
125	+ $(top_builddir)/simgear/xml/libsgxml.la \
126	+ $(top_builddir)/simgear/structure/libsgstructure.la \
127	-lz
128	$(base_LIBS)
d00765a8	129	--- SimGear-0.3.9.old/simgear/Makefile.am 2005-12-07 19:31:45.000000000 +0100
	130	+++ SimGear-0.3.9/simgear/Makefile.am 2005-12-07 20:52:26.000000000 +0100
	131	@@ -16,8 +16,11 @@
	132	$(compatibility_DIR) \
	133	xml \
	134	debug \
	135	- misc \
	136	+ props \
	137	+ serial \
	138	structure \
	139	+ timing \
	140	+ misc \
	141	bucket \
	142	ephemeris \
	143	io \
	144	@@ -25,13 +28,10 @@
	145	math \
	146	$(METAR_DIRS) \
	147	nasal \
	148	- props \
	149	route \
	150	scene \
	151	screen \
	152	- serial \
	153	sound \
	154	- $(SGTHREAD_DIR) \
	155	- timing
	156	+ $(SGTHREAD_DIR)
	157
	158	DIST_SUBDIRS = $(SUBDIRS) compatibility threads