]>
Commit | Line | Data |
---|---|---|
7be571f7 | 1 | --- SimGear-0.3.10/simgear/math/Makefile.am~ 2007-05-27 22:53:42.188543954 +0200 |
2 | +++ SimGear-0.3.10/simgear/math/Makefile.am 2007-05-27 22:59:01.806577335 +0200 | |
3 | @@ -51,4 +51,8 @@ | |
4 | fastmath.cxx \ | |
5 | SGGeodesy.cxx | |
6 | ||
7 | +libsgmath_la_LIBADD = \ | |
8 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
9 | + $(top_builddir)/simgear/misc/libsgmisc.la | |
10 | + | |
11 | INCLUDES = -I$(top_srcdir) | |
12 | --- SimGear-0.3.10/simgear/screen/Makefile.am~ 2007-05-27 23:11:02.950348097 +0200 | |
13 | +++ SimGear-0.3.10/simgear/screen/Makefile.am 2007-05-27 23:33:34.620784199 +0200 | |
14 | @@ -35,6 +35,10 @@ | |
15 | shader.cpp \ | |
16 | win32-printer.h | |
17 | ||
18 | +libsgscreen_la_LIBADD = \ | |
19 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
20 | + -lz -lplibssg | |
21 | + | |
22 | if HAVE_GLUT | |
23 | noinst_PROGRAMS = TestRenderTexture | |
24 | ||
25 | --- SimGear-0.3.10/simgear/route/Makefile.am~ 2007-05-27 23:05:59.287884796 +0200 | |
26 | +++ SimGear-0.3.10/simgear/route/Makefile.am 2007-05-27 23:08:36.070442820 +0200 | |
27 | @@ -8,6 +8,9 @@ | |
28 | route.cxx \ | |
29 | waypoint.cxx | |
30 | ||
31 | +libsgroute_la_LIBADD = \ | |
32 | + $(top_builddir)/simgear/math/libsgmath.la | |
33 | + | |
34 | INCLUDES = -I$(top_srcdir) | |
35 | ||
36 | noinst_PROGRAMS = waytest routetest | |
37 | --- SimGear-0.3.10/simgear/props/Makefile.am~ 2007-05-27 21:52:35.410553253 +0200 | |
38 | +++ SimGear-0.3.10/simgear/props/Makefile.am 2007-05-27 21:55:39.894540760 +0200 | |
39 | @@ -12,6 +12,8 @@ | |
40 | props.cxx \ | |
41 | props_io.cxx | |
42 | ||
43 | +libsgprops_la_LIBADD = \ | |
44 | + $(top_builddir)/simgear/xml/libsgxml.la | |
45 | ||
46 | # NOTE: Looped dependencies misc and props test files, commenting this one out | |
47 | # noinst_PROGRAMS = props_test | |
48 | --- SimGear-0.3.10/simgear/sound/Makefile.am~ 2007-05-27 23:34:49.685625164 +0200 | |
49 | +++ SimGear-0.3.10/simgear/sound/Makefile.am 2007-05-27 23:42:58.372038859 +0200 | |
50 | @@ -16,6 +16,13 @@ | |
51 | soundmgr_openal.cxx \ | |
52 | xmlsound.cxx | |
53 | ||
54 | +libsgsound_la_LIBADD = \ | |
55 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
56 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
57 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
58 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
59 | + -lalut | |
60 | + | |
61 | noinst_PROGRAMS = openal_test1 openal_test2 | |
62 | ||
63 | openal_test1_SOURCES = openal_test1.cxx | |
64 | --- SimGear-0.3.10/simgear/misc/Makefile.am~ 2007-05-27 21:50:20.566487449 +0200 | |
65 | +++ SimGear-0.3.10/simgear/misc/Makefile.am 2007-05-27 21:55:08.796678047 +0200 | |
66 | @@ -22,6 +22,12 @@ | |
67 | zfstream.cxx \ | |
68 | interpolator.cxx | |
69 | ||
70 | +libsgmisc_la_LIBADD = \ | |
71 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
72 | + $(top_builddir)/simgear/structure/libsgstructure.la \ | |
73 | + $(top_builddir)/simgear/props/libsgprops.la \ | |
74 | + -lz | |
75 | + | |
76 | noinst_PROGRAMS = tabbed_value_test swap_test | |
77 | ||
78 | tabbed_value_test_SOURCES = tabbed_values_test.cxx | |
79 | --- SimGear-0.3.10/simgear/io/Makefile.am~ 2007-05-27 22:00:31.414505255 +0200 | |
80 | +++ SimGear-0.3.10/simgear/io/Makefile.am 2007-05-27 22:13:53.776027440 +0200 | |
81 | @@ -20,6 +20,14 @@ | |
82 | sg_socket.cxx \ | |
83 | sg_socket_udp.cxx | |
84 | ||
85 | +libsgio_la_LIBADD = \ | |
86 | + $(top_builddir)/simgear/bucket/libsgbucket.la \ | |
87 | + $(top_builddir)/simgear/debug/libsgdebug.la \ | |
88 | + $(top_builddir)/simgear/misc/libsgmisc.la \ | |
89 | + $(top_builddir)/simgear/serial/libsgserial.la \ | |
90 | + -lplibnet \ | |
91 | + -lz | |
92 | + | |
93 | INCLUDES = -I$(top_srcdir) | |
94 | ||
95 | noinst_PROGRAMS = decode_binobj socktest lowtest tcp_server tcp_client |