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