fly/flightgear
1
0
Fork 0
Code Activity

Updates to build system to better support automake-1.5

Browse source 
- automake-1.4 sets default values for INCLUDES which we can't
  overwrite.
- automake-1.5 renames this to DEFAULT_INCLUDES and leaves INCLUDES
  open for the developer to use.

Thus for automake-1.4 we are forced to 'append' to INCLUDES and in
automake-1.5 we can just set the value to whatever we like.
Unfortunately, the behaviors of the two versions are mutually
incompatible.

The solution I am committing now works for both versions but
automake-1.5 generates a lot of spurious warning messages that are
annoying, but not fatal.
This commit is contained in:
curt 2001-12-28 22:29:59 +00:00
parent 3b70eae4c9
commit 1fa4c88d0e
25 changed files with 109 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ATC/Makefile.am
View file

@ -4,4 +4,8 @@ libATC_a_SOURCES = \
atis.cxx atis.hxx atislist.hxx atislist.cxx \ atis.cxx atis.hxx atislist.hxx atislist.cxx \
ATCdisplay.hxx ATCdisplay.cxx ATCdisplay.hxx ATCdisplay.cxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Aircraft/Makefile.am
View file

@ -2,4 +2,8 @@ noinst_LIBRARIES = libAircraft.a
libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Airports/Makefile.am
View file

@ -12,4 +12,8 @@ gensimple_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
genrunways_SOURCES = genrunways.cxx genrunways_SOURCES = genrunways.cxx
genrunways_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz genrunways_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Autopilot/Makefile.am
View file

@ -4,4 +4,8 @@ libAutopilot_a_SOURCES = \
auto_gui.cxx auto_gui.hxx \ auto_gui.cxx auto_gui.hxx \
newauto.cxx newauto.hxx newauto.cxx newauto.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Cockpit/Makefile.am
View file

@ -12,4 +12,8 @@ libCockpit_a_SOURCES = \
radiostack.cxx radiostack.hxx \ radiostack.cxx radiostack.hxx \
steam.cxx steam.hxx steam.cxx steam.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Controls/Makefile.am
View file

@ -2,4 +2,8 @@ noinst_LIBRARIES = libControls.a
libControls_a_SOURCES = controls.cxx controls.hxx libControls_a_SOURCES = controls.cxx controls.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/FDM/Balloon/Makefile.am
View file

@ -2,4 +2,8 @@ noinst_LIBRARIES = libBalloon.a
libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

9
src/FDM/JSBSim/Makefile.am
View file

@ -67,6 +67,11 @@ testJSBsim_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
# demo_LDADD = libJSBSim.a filtersjb/libfiltersjb.a # demo_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
INCLUDES += -I$(top_srcdir)/src if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
DEFS += -DFGFS DEFS += -DFGFS
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
AM_CXXFLAGS = -DFGFS
endif

9
src/FDM/JSBSim/filtersjb/Makefile.am
View file

@ -12,6 +12,11 @@ libfiltersjb_a_SOURCES = \
FGSummer.cpp FGSummer.h \ FGSummer.cpp FGSummer.h \
FGSwitch.cpp FGSwitch.h FGSwitch.cpp FGSwitch.h
INCLUDES += -I$(top_srcdir)/src if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
DEFS += -DFGFS DEFS += -DFGFS
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
AM_CXXFLAGS = -DFGFS
endif

4
src/FDM/LaRCsim/Makefile.am
View file

@ -32,4 +32,8 @@ libLaRCsim_a_SOURCES = \
$(AIRCRAFT_MODEL) \ $(AIRCRAFT_MODEL) \
ls_interface.c ls_interface.h ls_interface.c ls_interface.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/FDM/Makefile.am
View file

@ -19,4 +19,8 @@ bin_PROGRAMS = pstest
pstest_SOURCES = ps-10520c.cxx pstest_SOURCES = ps-10520c.cxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/FDM/UIUCModel/Makefile.am
View file

@ -51,4 +51,8 @@ libUIUCModel_a_SOURCES = \
uiuc_warnings_errors.cpp uiuc_warnings_errors.h \ uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
uiuc_wrapper.cpp uiuc_wrapper.h uiuc_wrapper.cpp uiuc_wrapper.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/FDM/YASim/Makefile.am
View file

@ -6,4 +6,8 @@ libYASim_a_SOURCES = YASim.cxx Airplane.cpp Atmosphere.cpp ControlMap.cpp \
PropEngine.cpp RigidBody.cpp Surface.cpp \ PropEngine.cpp RigidBody.cpp Surface.cpp \
Thruster.cpp Wing.cpp SimpleJet.cpp Thruster.cpp Wing.cpp SimpleJet.cpp
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/GUI/Makefile.am
View file

@ -16,4 +16,8 @@ libGUI_a_SOURCES = \
sgVec3Slider.cxx sgVec3Slider.hxx \ sgVec3Slider.cxx sgVec3Slider.hxx \
trackball.c trackball.h trackball.c trackball.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Input/Makefile.am
View file

@ -12,4 +12,8 @@ fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
fgjs_LDADD = $(audio_LIBS) fgjs_LDADD = $(audio_LIBS)
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

8
src/Main/Makefile.am
View file

@ -25,7 +25,7 @@ else
THREAD_LIBS = THREAD_LIBS =
endif endif
if OLD_AUTOMAKE if ANCIENT_AUTOMAKE
# nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\" # nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
else else
AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
@ -86,4 +86,10 @@ fgfs_LDADD = \
$(opengl_LIBS) \ $(opengl_LIBS) \
$(audio_LIBS) $(audio_LIBS)
fgfs_CFLAGS = -DTHIS_IS_A_TEST
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Navaids/Makefile.am
View file

@ -14,4 +14,8 @@ testnavs_LDADD = \
-lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \ -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
-lz -lz
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Network/Makefile.am
View file

@ -17,4 +17,8 @@ libNetwork_a_SOURCES = \
ray.cxx ray.hxx \ ray.cxx ray.hxx \
rul.cxx rul.hxx rul.cxx rul.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/NetworkOLK/Makefile.am
View file

@ -3,4 +3,8 @@ noinst_LIBRARIES = libNetworkOLK.a
libNetworkOLK_a_SOURCES = \ libNetworkOLK_a_SOURCES = \
net_send.cxx net_hud.cxx network.cxx network.h fgd.h net_send.cxx net_hud.cxx network.cxx network.h fgd.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Objects/Makefile.am
View file

@ -7,4 +7,8 @@ libObjects_a_SOURCES = \
obj.cxx obj.hxx \ obj.cxx obj.hxx \
texload.c texload.h colours.h texload.c texload.h colours.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Scenery/Makefile.am
View file

@ -8,4 +8,8 @@ libScenery_a_SOURCES = \
tileentry.cxx tileentry.hxx \ tileentry.cxx tileentry.hxx \
tilemgr.cxx tilemgr.hxx tilemgr.cxx tilemgr.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Sound/Makefile.am
View file

@ -6,4 +6,8 @@ libSound_a_SOURCES = \
morse.cxx morse.hxx \ morse.cxx morse.hxx \
soundmgr.cxx soundmgr.hxx soundmgr.cxx soundmgr.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Time/Makefile.am
View file

@ -12,4 +12,8 @@ libTime_a_SOURCES = \
# lowleveltime.cxx lowleveltime.h \ # lowleveltime.cxx lowleveltime.h \
# timezone.cxx timezone.h # timezone.cxx timezone.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/Weather/Makefile.am
View file

@ -6,4 +6,8 @@ noinst_LIBRARIES = libWeather.a
libWeather_a_SOURCES = weather.cxx weather.hxx libWeather_a_SOURCES = weather.cxx weather.hxx
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif

4
src/WeatherCM/Makefile.am
View file

@ -18,4 +18,8 @@ libWeatherCM_a_SOURCES = \
FGWeatherVectorWrap.h \ FGWeatherVectorWrap.h \
FGWindItem.cpp FGWindItem.h FGWindItem.cpp FGWindItem.h
if OLD_AUTOMAKE
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
else
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
endif