]> git.pld-linux.org Git - packages/FlightGear.git/blame - FlightGear-am_fix.patch
projects / packages / FlightGear.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- added ac_fix patch
[packages/FlightGear.git] / FlightGear-am_fix.patch
CommitLineData
9f714579
MM		 1diff -urN FlightGear-0.7.10.orig/src/ATC/Makefile.am FlightGear-0.7.10/src/ATC/Makefile.am
2--- FlightGear-0.7.10.orig/src/ATC/Makefile.am Fri May 10 23:08:45 2002
3+++ FlightGear-0.7.10/src/ATC/Makefile.am Fri May 10 23:11:50 2002
4@@ -12,8 +12,5 @@
5 AIEntity.hxx AIEntity.cxx \
6 AILocalTraffic.hxx AILocalTraffic.cxx
7
8-if OLD_AUTOMAKE
9-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
10-else
11 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
12-endif
13+
14diff -urN FlightGear-0.7.10.orig/src/Aircraft/Makefile.am FlightGear-0.7.10/src/Aircraft/Makefile.am
15--- FlightGear-0.7.10.orig/src/Aircraft/Makefile.am Fri May 10 23:08:45 2002
16+++ FlightGear-0.7.10/src/Aircraft/Makefile.am Fri May 10 23:12:01 2002
17@@ -2,8 +2,5 @@
18
19 libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx
20
21-if OLD_AUTOMAKE
22-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
23-else
24 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
25-endif
26+
27diff -urN FlightGear-0.7.10.orig/src/Airports/Makefile.am FlightGear-0.7.10/src/Airports/Makefile.am
28--- FlightGear-0.7.10.orig/src/Airports/Makefile.am Fri May 10 23:08:45 2002
29+++ FlightGear-0.7.10/src/Airports/Makefile.am Fri May 10 23:12:29 2002
30@@ -12,8 +12,5 @@
31 genrunways_SOURCES = genrunways.cxx
32 genrunways_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
33
34-if OLD_AUTOMAKE
35-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
36-else
37 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
38-endif
39+
40diff -urN FlightGear-0.7.10.orig/src/Autopilot/Makefile.am FlightGear-0.7.10/src/Autopilot/Makefile.am
41--- FlightGear-0.7.10.orig/src/Autopilot/Makefile.am Fri May 10 23:08:45 2002
42+++ FlightGear-0.7.10/src/Autopilot/Makefile.am Fri May 10 23:12:45 2002
43@@ -4,8 +4,5 @@
44 auto_gui.cxx auto_gui.hxx \
45 newauto.cxx newauto.hxx
46
47-if OLD_AUTOMAKE
48-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
49-else
50 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
51-endif
52+
53diff -urN FlightGear-0.7.10.orig/src/Cockpit/Makefile.am FlightGear-0.7.10/src/Cockpit/Makefile.am
54--- FlightGear-0.7.10.orig/src/Cockpit/Makefile.am Fri May 10 23:08:45 2002
55+++ FlightGear-0.7.10/src/Cockpit/Makefile.am Fri May 10 23:12:56 2002
56@@ -12,10 +12,6 @@
57 radiostack.cxx radiostack.hxx \
58 steam.cxx steam.hxx
59
60-if OLD_AUTOMAKE
61-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
62-else
63 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
64-endif
65
66 SUBDIRS = built_in
67diff -urN FlightGear-0.7.10.orig/src/Cockpit/built_in/Makefile.am FlightGear-0.7.10/src/Cockpit/built_in/Makefile.am
68--- FlightGear-0.7.10.orig/src/Cockpit/built_in/Makefile.am Fri May 10 23:08:45 2002
69+++ FlightGear-0.7.10/src/Cockpit/built_in/Makefile.am Fri May 10 23:13:10 2002
70@@ -3,9 +3,5 @@
71 libBuilt_in_a_SOURCES = \
72 FGMagRibbon.cxx FGMagRibbon.hxx
73
74-if OLD_AUTOMAKE
75-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
76-else
77 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
78-endif
79
80diff -urN FlightGear-0.7.10.orig/src/Controls/Makefile.am FlightGear-0.7.10/src/Controls/Makefile.am
81--- FlightGear-0.7.10.orig/src/Controls/Makefile.am Fri May 10 23:08:45 2002
82+++ FlightGear-0.7.10/src/Controls/Makefile.am Fri May 10 23:13:21 2002
83@@ -2,8 +2,5 @@
84
85 libControls_a_SOURCES = controls.cxx controls.hxx
86
87-if OLD_AUTOMAKE
88-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
89-else
90 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
91-endif
92+
93diff -urN FlightGear-0.7.10.orig/src/Environment/Makefile.am FlightGear-0.7.10/src/Environment/Makefile.am
94--- FlightGear-0.7.10.orig/src/Environment/Makefile.am Fri May 10 23:08:45 2002
95+++ FlightGear-0.7.10/src/Environment/Makefile.am Fri May 10 23:13:37 2002
96@@ -7,8 +7,5 @@
97 libEnvironment_a_SOURCES = environment.cxx environment.hxx \
98 environment_mgr.cxx environment_mgr.hxx
99
100-if OLD_AUTOMAKE
101-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
102-else
103 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
104-endif
105+
106diff -urN FlightGear-0.7.10.orig/src/FDM/Balloon/Makefile.am FlightGear-0.7.10/src/FDM/Balloon/Makefile.am
107--- FlightGear-0.7.10.orig/src/FDM/Balloon/Makefile.am Fri May 10 23:08:45 2002
108+++ FlightGear-0.7.10/src/FDM/Balloon/Makefile.am Fri May 10 23:13:49 2002
109@@ -2,8 +2,5 @@
110
111 libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h
112
113-if OLD_AUTOMAKE
114-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
115-else
116 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
117-endif
118+
119diff -urN FlightGear-0.7.10.orig/src/FDM/JSBSim/Makefile.am FlightGear-0.7.10/src/FDM/JSBSim/Makefile.am
120--- FlightGear-0.7.10.orig/src/FDM/JSBSim/Makefile.am Fri May 10 23:08:45 2002
121+++ FlightGear-0.7.10/src/FDM/JSBSim/Makefile.am Fri May 10 23:14:05 2002
122@@ -54,11 +54,6 @@
123
124 # noinst_PROGRAMS = testJSBsim
125
126-if OLD_AUTOMAKE
127-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
128-DEFS += -DFGFS
129-else
130 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
131 AM_CXXFLAGS = -DFGFS
132-endif
133
134diff -urN FlightGear-0.7.10.orig/src/FDM/JSBSim/filtersjb/Makefile.am FlightGear-0.7.10/src/FDM/JSBSim/filtersjb/Makefile.am
135--- FlightGear-0.7.10.orig/src/FDM/JSBSim/filtersjb/Makefile.am Fri May 10 23:08:45 2002
136+++ FlightGear-0.7.10/src/FDM/JSBSim/filtersjb/Makefile.am Fri May 10 23:14:38 2002
137@@ -12,11 +12,6 @@
138 FGSummer.cpp FGSummer.h \
139 FGSwitch.cpp FGSwitch.h
140
141-if OLD_AUTOMAKE
142-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
143-DEFS += -DFGFS
144-else
145 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
146 AM_CXXFLAGS = -DFGFS
147-endif
148
149diff -urN FlightGear-0.7.10.orig/src/FDM/LaRCsim/Makefile.am FlightGear-0.7.10/src/FDM/LaRCsim/Makefile.am
150--- FlightGear-0.7.10.orig/src/FDM/LaRCsim/Makefile.am Fri May 10 23:08:45 2002
151+++ FlightGear-0.7.10/src/FDM/LaRCsim/Makefile.am Fri May 10 23:15:01 2002
152@@ -32,8 +32,5 @@
153 $(AIRCRAFT_MODEL) \
154 ls_interface.c ls_interface.h
155
156-if OLD_AUTOMAKE
157-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
158-else
159 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
160-endif
161+
162diff -urN FlightGear-0.7.10.orig/src/FDM/Makefile.am FlightGear-0.7.10/src/FDM/Makefile.am
163--- FlightGear-0.7.10.orig/src/FDM/Makefile.am Fri May 10 23:08:45 2002
164+++ FlightGear-0.7.10/src/FDM/Makefile.am Fri May 10 23:15:16 2002
165@@ -14,8 +14,5 @@
166 MagicCarpet.cxx MagicCarpet.hxx \
167 NullFDM.cxx NullFDM.hxx
168
169-if OLD_AUTOMAKE
170-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
171-else
172 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
173-endif
174+
175diff -urN FlightGear-0.7.10.orig/src/FDM/UIUCModel/Makefile.am FlightGear-0.7.10/src/FDM/UIUCModel/Makefile.am
176--- FlightGear-0.7.10.orig/src/FDM/UIUCModel/Makefile.am Fri May 10 23:08:45 2002
177+++ FlightGear-0.7.10/src/FDM/UIUCModel/Makefile.am Fri May 10 23:15:28 2002
178@@ -52,8 +52,5 @@
179 uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
180 uiuc_wrapper.cpp uiuc_wrapper.h
181
182-if OLD_AUTOMAKE
183-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
184-else
185 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
186-endif
187+
188diff -urN FlightGear-0.7.10.orig/src/FDM/YASim/Makefile.am FlightGear-0.7.10/src/FDM/YASim/Makefile.am
189--- FlightGear-0.7.10.orig/src/FDM/YASim/Makefile.am Fri May 10 23:08:45 2002
190+++ FlightGear-0.7.10/src/FDM/YASim/Makefile.am Fri May 10 23:15:39 2002
191@@ -23,8 +23,5 @@
192 Vector.hpp \
193 Wing.cpp Wing.hpp
194
195-if OLD_AUTOMAKE
196-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
197-else
198 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
199-endif
200+
201diff -urN FlightGear-0.7.10.orig/src/GUI/Makefile.am FlightGear-0.7.10/src/GUI/Makefile.am
202--- FlightGear-0.7.10.orig/src/GUI/Makefile.am Fri May 10 23:08:45 2002
203+++ FlightGear-0.7.10/src/GUI/Makefile.am Fri May 10 23:15:51 2002
204@@ -16,8 +16,5 @@
205 sgVec3Slider.cxx sgVec3Slider.hxx \
206 trackball.c trackball.h
207
208-if OLD_AUTOMAKE
209-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
210-else
211 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
212-endif
213+
214diff -urN FlightGear-0.7.10.orig/src/Input/Makefile.am FlightGear-0.7.10/src/Input/Makefile.am
215--- FlightGear-0.7.10.orig/src/Input/Makefile.am Fri May 10 23:08:45 2002
216+++ FlightGear-0.7.10/src/Input/Makefile.am Fri May 10 23:16:04 2002
217@@ -12,8 +12,5 @@
218
219 fgjs_LDADD = $(audio_LIBS)
220
221-if OLD_AUTOMAKE
222-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
223-else
224 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
225-endif
226+
227diff -urN FlightGear-0.7.10.orig/src/Main/Makefile.am FlightGear-0.7.10/src/Main/Makefile.am
228--- FlightGear-0.7.10.orig/src/Main/Makefile.am Fri May 10 23:08:45 2002
229+++ FlightGear-0.7.10/src/Main/Makefile.am Fri May 10 23:16:20 2002
230@@ -90,10 +90,6 @@
231
232 fgfs_CFLAGS = -DTHIS_IS_A_TEST
233
234-if OLD_AUTOMAKE
235-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
236-else
237 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
238-endif
239
240
241diff -urN FlightGear-0.7.10.orig/src/Model/Makefile.am FlightGear-0.7.10/src/Model/Makefile.am
242--- FlightGear-0.7.10.orig/src/Model/Makefile.am Fri May 10 23:08:45 2002
243+++ FlightGear-0.7.10/src/Model/Makefile.am Fri May 10 23:16:29 2002
244@@ -4,8 +4,5 @@
245 modelmgr.cxx modelmgr.hxx \
246 acmodel.cxx acmodel.hxx
247
248-if OLD_AUTOMAKE
249-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
250-else
251 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
252-endif
253+
254diff -urN FlightGear-0.7.10.orig/src/Navaids/Makefile.am FlightGear-0.7.10/src/Navaids/Makefile.am
255--- FlightGear-0.7.10.orig/src/Navaids/Makefile.am Fri May 10 23:08:45 2002
256+++ FlightGear-0.7.10/src/Navaids/Makefile.am Fri May 10 23:16:40 2002
257@@ -14,8 +14,5 @@
258 -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
259 -lz
260
261-if OLD_AUTOMAKE
262-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
263-else
264 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
265-endif
266+
267diff -urN FlightGear-0.7.10.orig/src/Network/Makefile.am FlightGear-0.7.10/src/Network/Makefile.am
268--- FlightGear-0.7.10.orig/src/Network/Makefile.am Fri May 10 23:08:45 2002
269+++ FlightGear-0.7.10/src/Network/Makefile.am Fri May 10 23:16:51 2002
270@@ -26,8 +26,5 @@
271 ray.cxx ray.hxx \
272 rul.cxx rul.hxx
273
274-if OLD_AUTOMAKE
275-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
276-else
277 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
278-endif
279+
280diff -urN FlightGear-0.7.10.orig/src/NetworkOLK/Makefile.am FlightGear-0.7.10/src/NetworkOLK/Makefile.am
281--- FlightGear-0.7.10.orig/src/NetworkOLK/Makefile.am Fri May 10 23:08:45 2002
282+++ FlightGear-0.7.10/src/NetworkOLK/Makefile.am Fri May 10 23:17:02 2002
283@@ -3,8 +3,5 @@
284 libNetworkOLK_a_SOURCES = \
285 net_send.cxx net_hud.cxx network.cxx network.h fgd.h
286
287-if OLD_AUTOMAKE
288-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
289-else
290 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
291-endif
292+
293diff -urN FlightGear-0.7.10.orig/src/Objects/Makefile.am FlightGear-0.7.10/src/Objects/Makefile.am
294--- FlightGear-0.7.10.orig/src/Objects/Makefile.am Fri May 10 23:08:45 2002
295+++ FlightGear-0.7.10/src/Objects/Makefile.am Fri May 10 23:17:11 2002
296@@ -8,8 +8,5 @@
297 obj.cxx obj.hxx \
298 texload.c texload.h colours.h
299
300-if OLD_AUTOMAKE
301-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
302-else
303 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
304-endif
305+
306diff -urN FlightGear-0.7.10.orig/src/Scenery/Makefile.am FlightGear-0.7.10/src/Scenery/Makefile.am
307--- FlightGear-0.7.10.orig/src/Scenery/Makefile.am Fri May 10 23:08:45 2002
308+++ FlightGear-0.7.10/src/Scenery/Makefile.am Fri May 10 23:17:21 2002
309@@ -8,8 +8,5 @@
310 tileentry.cxx tileentry.hxx \
311 tilemgr.cxx tilemgr.hxx
312
313-if OLD_AUTOMAKE
314-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
315-else
316 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
317-endif
318+
319diff -urN FlightGear-0.7.10.orig/src/Sound/Makefile.am FlightGear-0.7.10/src/Sound/Makefile.am
320--- FlightGear-0.7.10.orig/src/Sound/Makefile.am Fri May 10 23:08:45 2002
321+++ FlightGear-0.7.10/src/Sound/Makefile.am Fri May 10 23:17:32 2002
322@@ -7,8 +7,5 @@
323 morse.cxx morse.hxx \
324 soundmgr.cxx soundmgr.hxx
325
326-if OLD_AUTOMAKE
327-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
328-else
329 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
330-endif
331+
332diff -urN FlightGear-0.7.10.orig/src/Time/Makefile.am FlightGear-0.7.10/src/Time/Makefile.am
333--- FlightGear-0.7.10.orig/src/Time/Makefile.am Fri May 10 23:08:45 2002
334+++ FlightGear-0.7.10/src/Time/Makefile.am Fri May 10 23:17:42 2002
335@@ -8,8 +8,5 @@
336 sunpos.cxx sunpos.hxx \
337 tmp.cxx tmp.hxx
338
339-if OLD_AUTOMAKE
340-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
341-else
342 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
343-endif
344+
345diff -urN FlightGear-0.7.10.orig/src/WeatherCM/Makefile.am FlightGear-0.7.10/src/WeatherCM/Makefile.am
346--- FlightGear-0.7.10.orig/src/WeatherCM/Makefile.am Fri May 10 23:08:45 2002
347+++ FlightGear-0.7.10/src/WeatherCM/Makefile.am Fri May 10 23:17:54 2002
348@@ -19,8 +19,5 @@
349 linintp2.cpp linintp2.h \
350 sphrintp.cpp sphrintp.h
351
352-if OLD_AUTOMAKE
353-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
354-else
355 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
356-endif
357+
358--- FlightGear-0.7.10.origtests/Makefile.am~ Tue Mar 5 01:20:50 2002
359+++ FlightGear-0.7.10/tests/Makefile.am Fri May 10 23:31:04 2002
360@@ -21,4 +21,4 @@
361 test_text_LDADD = $(base_LIBS)
362
363 test_up_SOURCES = test-up.cxx
364-test_up_LDADD = -lsgmath -lsgdebug -lplibsg $(base_LIBS)
365+test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lsgmisc -lz -lsgxml $(base_LIBS)
Free Flight Simulator
This page took 0.127317 seconds and 4 git commands to generate.