]>
Commit | Line | Data |
---|---|---|
1aea824a AG |
1 | diff -burN FlightGear-0.9.6.orig/src/Airports/Makefile.am FlightGear-0.9.6/src/Airports/Makefile.am |
2 | --- FlightGear-0.9.6.orig/src/Airports/Makefile.am 2004-11-01 17:13:02.183256960 +0100 | |
3 | +++ FlightGear-0.9.6/src/Airports/Makefile.am 2004-11-01 17:13:54.304333352 +0100 | |
a4b17c14 SZ |
4 | @@ -7,6 +7,7 @@ |
5 | simple.cxx simple.hxx | |
bc5f32f3 | 6 | |
a4b17c14 SZ |
7 | calc_loc_SOURCES = calc_loc.cxx |
8 | -calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) | |
9 | +calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) \ | |
1aea824a | 10 | + -lsgprops -lsgstructure -lsgxml |
09cf986a | 11 | |
a4b17c14 | 12 | INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src |
1aea824a AG |
13 | diff -burN FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am FlightGear-0.9.6/src/FDM/YASim/Makefile.am |
14 | --- FlightGear-0.9.6.orig/src/FDM/YASim/Makefile.am 2004-11-01 17:13:02.016282344 +0100 | |
15 | +++ FlightGear-0.9.6/src/FDM/YASim/Makefile.am 2004-11-01 17:14:28.542128416 +0100 | |
8848fed4 | 16 | @@ -43,9 +43,9 @@ |
a4b17c14 SZ |
17 | |
18 | yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES) | |
19 | ||
1aea824a AG |
20 | -yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) |
21 | +yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz | |
a4b17c14 | 22 | |
8848fed4 | 23 | proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES) |
1aea824a AG |
24 | -proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) |
25 | +proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) -lz | |
8848fed4 | 26 | |
a4b17c14 | 27 | INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src |
1aea824a AG |
28 | diff -burN FlightGear-0.9.6.orig/src/Main/Makefile.am FlightGear-0.9.6/src/Main/Makefile.am |
29 | --- FlightGear-0.9.6.orig/src/Main/Makefile.am 2004-11-01 17:13:02.143263040 +0100 | |
30 | +++ FlightGear-0.9.6/src/Main/Makefile.am 2004-11-01 17:15:10.865694256 +0100 | |
31 | @@ -104,6 +104,6 @@ | |
a4b17c14 SZ |
32 | metar_LDADD = \ |
33 | -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \ | |
34 | -lplibnet -lplibul $(network_LIBS) \ | |
35 | - -lz $(base_LIBS) | |
36 | + -lz $(base_LIBS) -lsgserial -lsgprops -lsgxml | |
09cf986a | 37 | |
38 | INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src | |
1aea824a AG |
39 | diff -burN FlightGear-0.9.6.orig/src/Navaids/Makefile.am FlightGear-0.9.6/src/Navaids/Makefile.am |
40 | --- FlightGear-0.9.6.orig/src/Navaids/Makefile.am 2004-11-01 17:13:02.239248448 +0100 | |
41 | +++ FlightGear-0.9.6/src/Navaids/Makefile.am 2004-11-01 17:15:37.842593144 +0100 | |
8848fed4 | 42 | @@ -15,6 +15,6 @@ |
43 | # testnavs_LDADD = \ | |
44 | # libNavaids.a \ | |
45 | # -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \ | |
46 | -# -lsgstructure $(base_LIBS) -lz | |
47 | +# -lsgstructure $(base_LIBS) -lz -lsgprops | |
bc5f32f3 | 48 | |
49 | INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src | |
1aea824a AG |
50 | diff -burN FlightGear-0.9.6.orig/tests/Makefile.am FlightGear-0.9.6/tests/Makefile.am |
51 | --- FlightGear-0.9.6.orig/tests/Makefile.am 2004-11-01 17:13:02.274243128 +0100 | |
52 | +++ FlightGear-0.9.6/tests/Makefile.am 2004-11-01 17:15:59.265336392 +0100 | |
09cf986a | 53 | @@ -17,4 +17,4 @@ |
54 | test_text_SOURCES = test-text.cxx | |
e42e489c SZ |
55 | |
56 | test_up_SOURCES = test-up.cxx | |
8848fed4 | 57 | -test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS) |
58 | +test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS) -lsgprops | |
754d89bf | 59 | --- FlightGear-0.9.9.org/src/GUI/Makefile.am 2005-07-30 16:20:24.000000000 +0200 |
60 | +++ FlightGear-0.9.9/src/GUI/Makefile.am 2005-12-07 22:09:58.000000000 +0100 | |
61 | @@ -22,4 +22,6 @@ | |
62 | ||
63 | layout_test_LDADD = libGUI.a \ | |
64 | -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \ | |
65 | - -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) | |
66 | + -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) \ | |
67 | + -lxml | |
68 | + |