]>
Commit | Line | Data |
---|---|---|
e26f8204 JK |
1 | diff -uNr SimGear-1.9.1.orig/simgear/io/Makefile.am SimGear-1.9.1/simgear/io/Makefile.am |
2 | --- SimGear-1.9.1.orig/simgear/io/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
3 | +++ SimGear-1.9.1/simgear/io/Makefile.am 2009-08-11 18:09:26.000000000 +0200 | |
4 | @@ -20,6 +20,14 @@ | |
5 | sg_socket.cxx \ | |
6 | sg_socket_udp.cxx | |
7 | ||
8 | +libsgio_la_LIBADD = \ | |
9 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ | |
10 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
11 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
12 | + $(top_builddir)/simgear/serial/libsgserial.la \ | |
13 | + -lplibnet \ | |
14 | + -lz | |
15 | + | |
16 | INCLUDES = -I$(top_srcdir) | |
17 | ||
18 | noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client | |
19 | diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am SimGear-1.9.1/simgear/math/Makefile.am | |
20 | --- SimGear-1.9.1.orig/simgear/math/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
21 | +++ SimGear-1.9.1/simgear/math/Makefile.am 2009-08-11 18:09:26.000000000 +0200 | |
22 | @@ -52,4 +52,8 @@ | |
23 | SGGeod.cxx \ | |
7be571f7 | 24 | SGGeodesy.cxx |
25 | ||
26 | +libsgmath_la_LIBADD = \ | |
27 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
28 | + $(top_builddir)/simgear/misc/libsgmisc.la | |
29 | + | |
30 | INCLUDES = -I$(top_srcdir) | |
e26f8204 JK |
31 | diff -uNr SimGear-1.9.1.orig/simgear/math/Makefile.am.orig SimGear-1.9.1/simgear/math/Makefile.am.orig |
32 | --- SimGear-1.9.1.orig/simgear/math/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 | |
33 | +++ SimGear-1.9.1/simgear/math/Makefile.am.orig 2009-08-11 18:09:26.000000000 +0200 | |
34 | @@ -0,0 +1,55 @@ | |
35 | +includedir = @includedir@/math | |
36 | + | |
37 | +check_PROGRAMS = SGMathTest SGGeometryTest | |
38 | +TESTS = $(check_PROGRAMS) | |
39 | + | |
40 | +SGMathTest_SOURCES = SGMathTest.cxx | |
41 | +SGMathTest_LDADD = libsgmath.la $(base_LIBS) | |
42 | + | |
43 | +SGGeometryTest_SOURCES = SGGeometryTest.cxx | |
44 | +SGGeometryTest_LDADD = libsgmath.la $(base_LIBS) | |
45 | + | |
46 | +lib_LTLIBRARIES = libsgmath.la | |
47 | + | |
48 | +include_HEADERS = \ | |
49 | + interpolater.hxx \ | |
50 | + leastsqs.hxx \ | |
51 | + point3d.hxx \ | |
52 | + polar3d.hxx \ | |
53 | + sg_geodesy.hxx \ | |
54 | + sg_random.h \ | |
55 | + sg_types.hxx \ | |
56 | + vector.hxx \ | |
57 | + Math.hxx \ | |
58 | + SGBox.hxx \ | |
59 | + SGCMath.hxx \ | |
60 | + SGGeoc.hxx \ | |
61 | + SGGeod.hxx \ | |
62 | + SGGeodesy.hxx \ | |
63 | + SGGeometry.hxx \ | |
64 | + SGGeometryFwd.hxx \ | |
65 | + SGIntersect.hxx \ | |
66 | + SGLimits.hxx \ | |
67 | + SGLineSegment.hxx \ | |
68 | + SGMatrix.hxx \ | |
69 | + SGMath.hxx \ | |
70 | + SGMathFwd.hxx \ | |
71 | + SGMisc.hxx \ | |
72 | + SGPlane.hxx \ | |
73 | + SGQuat.hxx \ | |
74 | + SGRay.hxx \ | |
75 | + SGSphere.hxx \ | |
76 | + SGTriangle.hxx \ | |
77 | + SGVec2.hxx \ | |
78 | + SGVec3.hxx \ | |
79 | + SGVec4.hxx | |
80 | + | |
81 | +libsgmath_la_SOURCES = \ | |
82 | + interpolater.cxx \ | |
83 | + leastsqs.cxx \ | |
84 | + sg_random.c \ | |
85 | + vector.cxx \ | |
86 | + SGGeod.cxx \ | |
87 | + SGGeodesy.cxx | |
88 | + | |
89 | +INCLUDES = -I$(top_srcdir) | |
90 | diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am SimGear-1.9.1/simgear/misc/Makefile.am | |
91 | --- SimGear-1.9.1.orig/simgear/misc/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
92 | +++ SimGear-1.9.1/simgear/misc/Makefile.am 2009-08-11 18:11:32.000000000 +0200 | |
93 | @@ -24,6 +24,14 @@ | |
94 | interpolator.cxx \ | |
95 | PathOptions.cxx | |
7be571f7 | 96 | |
e26f8204 | 97 | +libsgmisc_la_LIBADD = \ |
7be571f7 | 98 | + $(top_builddir)/simgear/debug/libsgdebug.la \ |
e26f8204 JK |
99 | + $(top_builddir)/simgear/structure/libsgstructure.la \ |
100 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
101 | + -lz \ | |
102 | + -losg \ | |
103 | + -losgDB | |
104 | + | |
105 | noinst_PROGRAMS = tabbed_value_test swap_test | |
106 | ||
107 | tabbed_value_test_SOURCES = tabbed_values_test.cxx | |
108 | diff -uNr SimGear-1.9.1.orig/simgear/misc/Makefile.am.orig SimGear-1.9.1/simgear/misc/Makefile.am.orig | |
109 | --- SimGear-1.9.1.orig/simgear/misc/Makefile.am.orig 1970-01-01 01:00:00.000000000 +0100 | |
110 | +++ SimGear-1.9.1/simgear/misc/Makefile.am.orig 2009-08-11 18:09:26.000000000 +0200 | |
111 | @@ -0,0 +1,43 @@ | |
112 | +includedir = @includedir@/misc | |
7be571f7 | 113 | + |
e26f8204 JK |
114 | +lib_LTLIBRARIES = libsgmisc.la |
115 | + | |
116 | +include_HEADERS = \ | |
117 | + sg_path.hxx \ | |
118 | + sgstream.hxx \ | |
119 | + stopwatch.hxx \ | |
120 | + strutils.hxx \ | |
121 | + tabbed_values.hxx \ | |
122 | + texcoord.hxx \ | |
123 | + zfstream.hxx \ | |
124 | + interpolator.hxx \ | |
125 | + stdint.hxx \ | |
126 | + PathOptions.hxx | |
127 | + | |
128 | +libsgmisc_la_SOURCES = \ | |
129 | + sg_path.cxx \ | |
130 | + sgstream.cxx \ | |
131 | + strutils.cxx \ | |
132 | + tabbed_values.cxx \ | |
133 | + texcoord.cxx \ | |
134 | + zfstream.cxx \ | |
135 | + interpolator.cxx \ | |
136 | + PathOptions.cxx | |
137 | + | |
138 | +noinst_PROGRAMS = tabbed_value_test swap_test | |
139 | + | |
140 | +tabbed_value_test_SOURCES = tabbed_values_test.cxx | |
141 | +tabbed_value_test_LDADD = \ | |
142 | + libsgmisc.la \ | |
143 | + $(top_builddir)/simgear/xml/libsgxml.la \ | |
144 | + $(top_builddir)/simgear/debug/libsgdebug.la | |
145 | + | |
146 | +$(top_builddir)/simgear/xml/libsgxml.a: | |
147 | + cd $(top_builddir)/simgear/xml && $(MAKE) $(AM_MAKEFLAGS) libsgxml.la | |
148 | + | |
149 | +$(top_builddir)/simgear/debug/libsgdebug.a: | |
150 | + cd $(top_builddir)/simgear/debug && $(MAKE) $(AM_MAKEFLAGS) libsgdebug.la | |
151 | + | |
152 | +swap_test_SOURCES = swap_test.cpp | |
153 | + | |
154 | +INCLUDES = -I$(top_srcdir) | |
155 | diff -uNr SimGear-1.9.1.orig/simgear/props/Makefile.am SimGear-1.9.1/simgear/props/Makefile.am | |
156 | --- SimGear-1.9.1.orig/simgear/props/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
157 | +++ SimGear-1.9.1/simgear/props/Makefile.am 2009-08-11 18:09:26.000000000 +0200 | |
158 | @@ -12,6 +12,8 @@ | |
159 | props.cxx \ | |
160 | props_io.cxx | |
161 | ||
162 | +libsgprops_la_LIBADD = \ | |
163 | + $(top_builddir)/simgear/xml/libsgxml.la | |
7be571f7 | 164 | |
e26f8204 JK |
165 | # NOTE: Looped dependencies misc and props test files, commenting this one out |
166 | # noinst_PROGRAMS = props_test | |
167 | diff -uNr SimGear-1.9.1.orig/simgear/route/Makefile.am SimGear-1.9.1/simgear/route/Makefile.am | |
168 | --- SimGear-1.9.1.orig/simgear/route/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
169 | +++ SimGear-1.9.1/simgear/route/Makefile.am 2009-08-11 18:09:26.000000000 +0200 | |
7be571f7 | 170 | @@ -8,6 +8,9 @@ |
171 | route.cxx \ | |
172 | waypoint.cxx | |
173 | ||
174 | +libsgroute_la_LIBADD = \ | |
175 | + $(top_builddir)/simgear/math/libsgmath.la | |
176 | + | |
177 | INCLUDES = -I$(top_srcdir) | |
178 | ||
179 | noinst_PROGRAMS = waytest routetest | |
e26f8204 JK |
180 | diff -uNr SimGear-1.9.1.orig/simgear/screen/Makefile.am SimGear-1.9.1/simgear/screen/Makefile.am |
181 | --- SimGear-1.9.1.orig/simgear/screen/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
182 | +++ SimGear-1.9.1/simgear/screen/Makefile.am 2009-08-11 18:09:26.000000000 +0200 | |
183 | @@ -35,6 +35,10 @@ | |
184 | shader.cpp \ | |
185 | win32-printer.h | |
7be571f7 | 186 | |
e26f8204 JK |
187 | +libsgscreen_la_LIBADD = \ |
188 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
189 | + -lz -lplibssg | |
190 | + | |
191 | if HAVE_GLUT | |
192 | noinst_PROGRAMS = TestRenderTexture | |
7be571f7 | 193 | |
e26f8204 JK |
194 | diff -uNr SimGear-1.9.1.orig/simgear/sound/Makefile.am SimGear-1.9.1/simgear/sound/Makefile.am |
195 | --- SimGear-1.9.1.orig/simgear/sound/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
196 | +++ SimGear-1.9.1/simgear/sound/Makefile.am 2009-08-11 18:09:26.000000000 +0200 | |
7be571f7 | 197 | @@ -16,6 +16,13 @@ |
198 | soundmgr_openal.cxx \ | |
199 | xmlsound.cxx | |
200 | ||
201 | +libsgsound_la_LIBADD = \ | |
202 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
203 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
204 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
205 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
206 | + -lalut | |
207 | + | |
208 | noinst_PROGRAMS = openal_test1 openal_test2 | |
209 | ||
210 | openal_test1_SOURCES = openal_test1.cxx | |
e26f8204 JK |
211 | diff -uNr SimGear-1.9.1.orig/simgear/structure/Makefile.am SimGear-1.9.1/simgear/structure/Makefile.am |
212 | --- SimGear-1.9.1.orig/simgear/structure/Makefile.am 2009-08-11 14:39:56.000000000 +0200 | |
213 | +++ SimGear-1.9.1/simgear/structure/Makefile.am 2009-08-11 18:09:26.000000000 +0200 | |
214 | @@ -30,5 +30,9 @@ | |
215 | SGSmplhist.cxx \ | |
216 | SGSmplstat.cxx | |
7be571f7 | 217 | |
e26f8204 JK |
218 | +libsgstructure_la_LIBADD = \ |
219 | + $(top_builddir)/simgear/timing/libsgtiming.la \ | |
7be571f7 | 220 | + -lz |
221 | + | |
222 | INCLUDES = -I$(top_srcdir) | |
223 |