From 4f00d9a95928b179c5c8b2c3c6786a1c71e88531 Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 25 Aug 2002 19:40:04 +0000 Subject: [PATCH] Tidy up the autoconf/automake configuration a bit. - Removed some old cruft. - Removed some support for older versions of automake which technically was correct, but caused the newer automakes to squawk warnings during an initial sanity check (which isn't done very intelligently.) NOTE: this fix is technically not correct for older version of automake. These older version use the variable "INCLUDES" internally and could have them already set to an important value. That is why we were appending our values to them. However, newer versions of automake don't set this value themselves so it is an error to append to a non-existant variable. We seem to "get away" with overwriting the value on older versions of automake, but if you have problems, consider upgrading to at least automake-1.5. --- acconfig.h | 6 ------ src/ATC/Makefile.am | 4 ---- src/Aircraft/Makefile.am | 4 ---- src/Airports/Makefile.am | 4 ---- src/Autopilot/Makefile.am | 4 ---- src/Cockpit/Makefile.am | 4 ---- src/Cockpit/built_in/Makefile.am | 4 ---- src/Controls/Makefile.am | 4 ---- src/Environment/Makefile.am | 4 ---- src/FDM/Balloon/Makefile.am | 4 ---- src/FDM/JSBSim/Makefile.am | 3 +-- src/FDM/JSBSim/filtersjb/Makefile.am | 3 +-- src/FDM/LaRCsim/Makefile.am | 4 ---- src/FDM/Makefile.am | 4 ---- src/FDM/UIUCModel/Makefile.am | 4 ---- src/FDM/YASim/Makefile.am | 4 ---- src/GUI/Makefile.am | 4 ---- src/Input/Makefile.am | 4 ---- src/Main/Makefile.am | 14 +------------- src/Model/Makefile.am | 4 ---- src/Navaids/Makefile.am | 4 ---- src/Network/Makefile.am | 4 ---- src/NetworkOLK/Makefile.am | 4 ---- src/Objects/Makefile.am | 4 ---- src/Scenery/Makefile.am | 4 ---- src/Sound/Makefile.am | 4 ---- src/Time/Makefile.am | 4 ---- src/WeatherCM/Makefile.am | 4 ---- 28 files changed, 3 insertions(+), 119 deletions(-) diff --git a/acconfig.h b/acconfig.h index 5bdfd0d11..74d70ca88 100644 --- a/acconfig.h +++ b/acconfig.h @@ -187,12 +187,6 @@ /* Define if you have the wait3 system call. */ #undef HAVE_WAIT3 -/* Define if you have MetaKit installed system wide. */ -#undef HAVE_MK4 - -/* Define if you have zlib installed system wide. */ -#undef HAVE_ZLIB - /* Define as __inline if that's what the C compiler calls it. */ #undef inline diff --git a/src/ATC/Makefile.am b/src/ATC/Makefile.am index d72f2bbc8..2128a6f89 100644 --- a/src/ATC/Makefile.am +++ b/src/ATC/Makefile.am @@ -12,8 +12,4 @@ libATC_a_SOURCES = \ AIEntity.hxx AIEntity.cxx \ AILocalTraffic.hxx AILocalTraffic.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 bf84247b6..a26f5b7ee 100644 --- a/src/Aircraft/Makefile.am +++ b/src/Aircraft/Makefile.am @@ -2,8 +2,4 @@ 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 33effd4cf..2ac70f3b8 100644 --- a/src/Airports/Makefile.am +++ b/src/Airports/Makefile.am @@ -12,8 +12,4 @@ 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 6ed225010..01ee5cedb 100644 --- a/src/Autopilot/Makefile.am +++ b/src/Autopilot/Makefile.am @@ -4,8 +4,4 @@ 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 707ab999b..5796d2b98 100644 --- a/src/Cockpit/Makefile.am +++ b/src/Cockpit/Makefile.am @@ -14,10 +14,6 @@ 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 SUBDIRS = built_in diff --git a/src/Cockpit/built_in/Makefile.am b/src/Cockpit/built_in/Makefile.am index ffade8c18..1a596bcde 100644 --- a/src/Cockpit/built_in/Makefile.am +++ b/src/Cockpit/built_in/Makefile.am @@ -3,9 +3,5 @@ noinst_LIBRARIES = libBuilt_in.a libBuilt_in_a_SOURCES = \ FGMagRibbon.cxx FGMagRibbon.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 4d19a13cb..02729a4fa 100644 --- a/src/Controls/Makefile.am +++ b/src/Controls/Makefile.am @@ -2,8 +2,4 @@ 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/Environment/Makefile.am b/src/Environment/Makefile.am index decc9a3d6..9efb9d7bd 100644 --- a/src/Environment/Makefile.am +++ b/src/Environment/Makefile.am @@ -8,8 +8,4 @@ libEnvironment_a_SOURCES = environment.cxx environment.hxx \ environment_mgr.cxx environment_mgr.hxx \ environment_ctrl.cxx environment_ctrl.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 7fb7d6ae8..760ff1884 100644 --- a/src/FDM/Balloon/Makefile.am +++ b/src/FDM/Balloon/Makefile.am @@ -2,8 +2,4 @@ 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 2dbc7dc09..8fdddc1dc 100644 --- a/src/FDM/JSBSim/Makefile.am +++ b/src/FDM/JSBSim/Makefile.am @@ -55,10 +55,9 @@ libJSBSim_a_SOURCES = \ # noinst_PROGRAMS = testJSBsim 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 +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src diff --git a/src/FDM/JSBSim/filtersjb/Makefile.am b/src/FDM/JSBSim/filtersjb/Makefile.am index e8ca70905..984c1df60 100644 --- a/src/FDM/JSBSim/filtersjb/Makefile.am +++ b/src/FDM/JSBSim/filtersjb/Makefile.am @@ -13,10 +13,9 @@ libfiltersjb_a_SOURCES = \ FGSwitch.cpp FGSwitch.h 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 +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src diff --git a/src/FDM/LaRCsim/Makefile.am b/src/FDM/LaRCsim/Makefile.am index 44a1a4a10..a26c6445e 100644 --- a/src/FDM/LaRCsim/Makefile.am +++ b/src/FDM/LaRCsim/Makefile.am @@ -32,8 +32,4 @@ 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 53b862ad7..55f4b38ba 100644 --- a/src/FDM/Makefile.am +++ b/src/FDM/Makefile.am @@ -15,8 +15,4 @@ libFlight_a_SOURCES = \ UFO.cxx UFO.hxx \ NullFDM.cxx NullFDM.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/UIUCModel/Makefile.am b/src/FDM/UIUCModel/Makefile.am index a3b32b892..6f9b2a5ee 100644 --- a/src/FDM/UIUCModel/Makefile.am +++ b/src/FDM/UIUCModel/Makefile.am @@ -52,8 +52,4 @@ 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 3b3bd77fb..196acd359 100644 --- a/src/FDM/YASim/Makefile.am +++ b/src/FDM/YASim/Makefile.am @@ -23,8 +23,4 @@ libYASim_a_SOURCES = \ Vector.hpp \ Wing.cpp Wing.hpp -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 7140523c8..ad177f0b2 100644 --- a/src/GUI/Makefile.am +++ b/src/GUI/Makefile.am @@ -16,8 +16,4 @@ 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 b9b50334e..579cfa5aa 100644 --- a/src/Input/Makefile.am +++ b/src/Input/Makefile.am @@ -12,8 +12,4 @@ 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 f21c5cc66..4473794da 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -1,9 +1,3 @@ -if ENABLE_UNIX_SERIAL -SERIAL_LIBS = -lsgserial -else -SERIAL_LIBS = -endif - if ENABLE_WEATHERCM WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a else @@ -81,7 +75,7 @@ fgfs_LDADD = \ $(top_builddir)/src/Input/libInput.a \ -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \ -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \ - $(SERIAL_LIBS) \ + -lsgserial \ $(THREAD_LIBS) \ -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \ -lmk4 -lz \ @@ -90,10 +84,4 @@ fgfs_LDADD = \ 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/Model/Makefile.am b/src/Model/Makefile.am index 7ed105849..38d084553 100644 --- a/src/Model/Makefile.am +++ b/src/Model/Makefile.am @@ -6,8 +6,4 @@ libModel_a_SOURCES = loader.cxx loader.hxx \ acmodel.cxx acmodel.hxx \ panelnode.cxx panelnode.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/Navaids/Makefile.am b/src/Navaids/Makefile.am index 262a2be5a..36efadf08 100644 --- a/src/Navaids/Makefile.am +++ b/src/Navaids/Makefile.am @@ -14,8 +14,4 @@ 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 7766c0977..87fda61fb 100644 --- a/src/Network/Makefile.am +++ b/src/Network/Makefile.am @@ -26,8 +26,4 @@ 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 ad1f31be3..384d601da 100644 --- a/src/NetworkOLK/Makefile.am +++ b/src/NetworkOLK/Makefile.am @@ -3,8 +3,4 @@ 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 692c345f2..6561f7f05 100644 --- a/src/Objects/Makefile.am +++ b/src/Objects/Makefile.am @@ -8,8 +8,4 @@ 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 4146df3a1..4caa7141f 100644 --- a/src/Scenery/Makefile.am +++ b/src/Scenery/Makefile.am @@ -8,8 +8,4 @@ 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 ef3619b84..3889f4215 100644 --- a/src/Sound/Makefile.am +++ b/src/Sound/Makefile.am @@ -7,8 +7,4 @@ 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 55ae1362a..9a0be35ec 100644 --- a/src/Time/Makefile.am +++ b/src/Time/Makefile.am @@ -8,8 +8,4 @@ libTime_a_SOURCES = \ sunpos.cxx sunpos.hxx \ tmp.cxx tmp.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 7833f6a68..a88b0c273 100644 --- a/src/WeatherCM/Makefile.am +++ b/src/WeatherCM/Makefile.am @@ -19,8 +19,4 @@ libWeatherCM_a_SOURCES = \ linintp2.cpp linintp2.h \ sphrintp.cpp sphrintp.h -if OLD_AUTOMAKE -INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src -else INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -endif -- 2.39.5