Updates to build system to better support automake-1.5

- 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.

diff --git a/src/ATC/Makefile.am b/src/ATC/Makefile.am
index 7ec05a3ad61bf39395754732650e0a59a43d20e1..0c61ac5b12b44cddfc1749573e4dbdcd62c41fa2 100644 (file)
--- a/src/ATC/Makefile.am
+++ b/src/ATC/Makefile.am
@@ -4,4 +4,8 @@ libATC_a_SOURCES = \
        atis.cxx atis.hxx atislist.hxx atislist.cxx \
        ATCdisplay.hxx ATCdisplay.cxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Aircraft/Makefile.am b/src/Aircraft/Makefile.am
index 18f90349ee8e087702b8980febf177539c2a2273..bf84247b6f04a511765a8a600172e97c70cd59da 100644 (file)
--- a/src/Aircraft/Makefile.am
+++ b/src/Aircraft/Makefile.am
@@ -2,4 +2,8 @@ noinst_LIBRARIES = libAircraft.a
 
 libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Airports/Makefile.am b/src/Airports/Makefile.am
index 2ce185263cebd0450952ddbc6ad71bdd0f3f0030..33effd4cfaa4cb5a41113603c4a2538c0aa713b8 100644 (file)
--- a/src/Airports/Makefile.am
+++ b/src/Airports/Makefile.am
@@ -12,4 +12,8 @@ gensimple_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
 genrunways_SOURCES = genrunways.cxx
 genrunways_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Autopilot/Makefile.am b/src/Autopilot/Makefile.am
index 0102e4a4a5aa18856b8c5ed6f16f840fda8d1e62..6ed225010a362cee884607b8e6e1e53610ff5a76 100644 (file)
--- a/src/Autopilot/Makefile.am
+++ b/src/Autopilot/Makefile.am
@@ -4,4 +4,8 @@ libAutopilot_a_SOURCES = \
        auto_gui.cxx auto_gui.hxx \
        newauto.cxx newauto.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Cockpit/Makefile.am b/src/Cockpit/Makefile.am
index fb57ac7db2441bcc0cc456cfa73d818e1c919d1a..1121d42361bc8da418f4450777882de826718b67 100644 (file)
--- a/src/Cockpit/Makefile.am
+++ b/src/Cockpit/Makefile.am
@@ -12,4 +12,8 @@ libCockpit_a_SOURCES = \
        radiostack.cxx radiostack.hxx \
        steam.cxx steam.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am
index c05f6e90ae074fad612475690bd0d46291fa7433..4d19a13cba72bc5b06ad3fb85489fccd35d6d18c 100644 (file)
--- a/src/Controls/Makefile.am
+++ b/src/Controls/Makefile.am
@@ -2,4 +2,8 @@ noinst_LIBRARIES = libControls.a
 
 libControls_a_SOURCES = controls.cxx controls.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/FDM/Balloon/Makefile.am b/src/FDM/Balloon/Makefile.am
index 2d4ac60c7f539f62bad02f3a811224b2488a2f8c..7fb7d6ae82145115e9b121253cc05d6c9c5c6730 100644 (file)
--- a/src/FDM/Balloon/Makefile.am
+++ b/src/FDM/Balloon/Makefile.am
@@ -2,4 +2,8 @@ noinst_LIBRARIES = libBalloon.a
 
 libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 7b6da412ef8dccf9c78f5d6244032bc5fa311ae6..a141990dd9c113316d6e3a94604a05f9e0db2485 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -67,6 +67,11 @@ testJSBsim_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
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+AM_CXXFLAGS = -DFGFS
+endif
+

diff --git a/src/FDM/JSBSim/filtersjb/Makefile.am b/src/FDM/JSBSim/filtersjb/Makefile.am
index c58a91ca9f8c72bbe43509d32add2d3b847caa81..e8ca7090569bbcd81616e7b7f17e81cf105ef165 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/Makefile.am
+++ b/src/FDM/JSBSim/filtersjb/Makefile.am
@@ -12,6 +12,11 @@ libfiltersjb_a_SOURCES = \
        FGSummer.cpp FGSummer.h \
        FGSwitch.cpp FGSwitch.h
 
-INCLUDES += -I$(top_srcdir)/src
-
+if OLD_AUTOMAKE
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
 DEFS += -DFGFS
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+AM_CXXFLAGS = -DFGFS
+endif
+

diff --git a/src/FDM/LaRCsim/Makefile.am b/src/FDM/LaRCsim/Makefile.am
index e7e3acab8cf7c375954376bd99e4b7ab30160ec4..44a1a4a103e122a9fca4c6e2c2c40b2078cf054d 100644 (file)
--- a/src/FDM/LaRCsim/Makefile.am
+++ b/src/FDM/LaRCsim/Makefile.am
@@ -32,4 +32,8 @@ libLaRCsim_a_SOURCES = \
        $(AIRCRAFT_MODEL) \
        ls_interface.c ls_interface.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/FDM/Makefile.am b/src/FDM/Makefile.am
index 696f8d72e5df63b814babcaf2cd57b760a689647..7c86809559dc69f899f8c04411bbbc428596cad8 100644 (file)
--- a/src/FDM/Makefile.am
+++ b/src/FDM/Makefile.am
@@ -19,4 +19,8 @@ bin_PROGRAMS = pstest
 
 pstest_SOURCES = ps-10520c.cxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/FDM/UIUCModel/Makefile.am b/src/FDM/UIUCModel/Makefile.am
index 9b1646350ba2115030f53c82d405597ddd1befb6..54e1b8466d19bb3f0e8c6a9b214e8830316837d4 100644 (file)
--- a/src/FDM/UIUCModel/Makefile.am
+++ b/src/FDM/UIUCModel/Makefile.am
@@ -51,4 +51,8 @@ libUIUCModel_a_SOURCES = \
                         uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
                         uiuc_wrapper.cpp uiuc_wrapper.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/FDM/YASim/Makefile.am b/src/FDM/YASim/Makefile.am
index 715ee97dc43b4bd243450e8123790a59e90bbae4..1b87c28847c699fb266d0bc17c79784c172f0410 100644 (file)
--- a/src/FDM/YASim/Makefile.am
+++ b/src/FDM/YASim/Makefile.am
@@ -6,4 +6,8 @@ libYASim_a_SOURCES = YASim.cxx Airplane.cpp Atmosphere.cpp ControlMap.cpp \
                      PropEngine.cpp RigidBody.cpp Surface.cpp             \
                      Thruster.cpp Wing.cpp SimpleJet.cpp
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 143216f7844961a195f18855add8415255120231..850dce46a609c6d643238d9800e68a698afe66b5 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -16,4 +16,8 @@ libGUI_a_SOURCES = \
        sgVec3Slider.cxx sgVec3Slider.hxx \
        trackball.c trackball.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am
index 1c5a25cdb15cc1f0cefd7a561815879efeb28082..b9b50334ea23b1cf073fdebb8487d82c38cd0f20 100644 (file)
--- a/src/Input/Makefile.am
+++ b/src/Input/Makefile.am
@@ -12,4 +12,8 @@ fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
 
 fgjs_LDADD = $(audio_LIBS)
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index a6937492eaa27169bcf09983c2c5c56d246aea10..35e7407a6eea5a69010008d392f16c8758710263 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -25,7 +25,7 @@ else
 THREAD_LIBS =
 endif
 
-if OLD_AUTOMAKE
+if ANCIENT_AUTOMAKE
 # nothing CXXFLAGS += -DPKGLIBDIR=\"$(pkglibdir)\"
 else
 AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\"
@@ -86,4 +86,10 @@ fgfs_LDADD = \
        $(opengl_LIBS) \
        $(audio_LIBS)
 
+fgfs_CFLAGS = -DTHIS_IS_A_TEST
+
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Navaids/Makefile.am b/src/Navaids/Makefile.am
index ae92797192811e3683062b2e32552a9ad30d1500..262a2be5a1e63ee0c152c31e61f1ed197e2b11a6 100644 (file)
--- a/src/Navaids/Makefile.am
+++ b/src/Navaids/Makefile.am
@@ -14,4 +14,8 @@ testnavs_LDADD = \
        -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
        -lz
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Network/Makefile.am b/src/Network/Makefile.am
index 5a65aa5fd0fa1331990cd7231dbada1b73f3e576..5c1596cefc1cc678240de66a7c586a91c361f156 100644 (file)
--- a/src/Network/Makefile.am
+++ b/src/Network/Makefile.am
@@ -17,4 +17,8 @@ libNetwork_a_SOURCES = \
        ray.cxx ray.hxx \
        rul.cxx rul.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/NetworkOLK/Makefile.am b/src/NetworkOLK/Makefile.am
index d0ece619199ccd61abdaef1f2315bc12d1b164f0..ad1f31be3ecbd4db7a4911afe4b92d5888dc1859 100644 (file)
--- a/src/NetworkOLK/Makefile.am
+++ b/src/NetworkOLK/Makefile.am
@@ -3,4 +3,8 @@ noinst_LIBRARIES = libNetworkOLK.a
 libNetworkOLK_a_SOURCES = \
        net_send.cxx net_hud.cxx network.cxx network.h fgd.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Objects/Makefile.am b/src/Objects/Makefile.am
index 42ec6b40092f563f52b3421b29efc0553f9541d7..079d6772d0183d3ebed1f3013571aa1f95ebe65e 100644 (file)
--- a/src/Objects/Makefile.am
+++ b/src/Objects/Makefile.am
@@ -7,4 +7,8 @@ libObjects_a_SOURCES = \
        obj.cxx obj.hxx \
        texload.c texload.h colours.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Scenery/Makefile.am b/src/Scenery/Makefile.am
index c79da6009dc5a123bcf43031ce17b355b9263963..4146df3a150aabe8d1282381a2631e9acd96e6cb 100644 (file)
--- a/src/Scenery/Makefile.am
+++ b/src/Scenery/Makefile.am
@@ -8,4 +8,8 @@ libScenery_a_SOURCES = \
        tileentry.cxx tileentry.hxx \
        tilemgr.cxx tilemgr.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Sound/Makefile.am b/src/Sound/Makefile.am
index 00588500680f9ff7034de6955ee379f4d4b23a4a..57fad4fd96c02f42bfa0a20439785681fd533bde 100644 (file)
--- a/src/Sound/Makefile.am
+++ b/src/Sound/Makefile.am
@@ -6,4 +6,8 @@ libSound_a_SOURCES = \
        morse.cxx morse.hxx \
        soundmgr.cxx soundmgr.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Time/Makefile.am b/src/Time/Makefile.am
index cf008a448d895a215b28c41fd8d7a415b23bfc29..1e91358c31c29ff6fd14bd1600a503f4787664a4 100644 (file)
--- a/src/Time/Makefile.am
+++ b/src/Time/Makefile.am
@@ -12,4 +12,8 @@ libTime_a_SOURCES = \
        # lowleveltime.cxx lowleveltime.h \
        # timezone.cxx timezone.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/Weather/Makefile.am b/src/Weather/Makefile.am
index b4dc076e55b1249b945795f6fa92571825e69e29..59b3402c29bf93e076253fcd51e74f4534b2525c 100644 (file)
--- a/src/Weather/Makefile.am
+++ b/src/Weather/Makefile.am
@@ -6,4 +6,8 @@ noinst_LIBRARIES = libWeather.a
 
 libWeather_a_SOURCES = weather.cxx weather.hxx
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif

diff --git a/src/WeatherCM/Makefile.am b/src/WeatherCM/Makefile.am
index a3b1e7bc25c1e285214f3b6a0e512f89e657ebf3..036aca2e1e3613affc071bddad7c0f15346c3e28 100644 (file)
--- a/src/WeatherCM/Makefile.am
+++ b/src/WeatherCM/Makefile.am
@@ -18,4 +18,8 @@ libWeatherCM_a_SOURCES = \
        FGWeatherVectorWrap.h \
        FGWindItem.cpp FGWindItem.h
 
+if OLD_AUTOMAKE
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
+else
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+endif