builddir -> srcdir so builds can be done outside the master source directory.

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

diff --git a/src/Autopilot/Makefile.am b/src/Autopilot/Makefile.am
index 3d06234297b664fd15a48fcdbc8f00ee91912afe..0102e4a4a5aa18856b8c5ed6f16f840fda8d1e62 100644 (file)
--- a/src/Autopilot/Makefile.am
+++ b/src/Autopilot/Makefile.am
@@ -4,4 +4,4 @@ libAutopilot_a_SOURCES = \
        auto_gui.cxx auto_gui.hxx \
        newauto.cxx newauto.hxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Cockpit/Makefile.am b/src/Cockpit/Makefile.am
index 69fd6c8a16120c5fef7a4f790992c1eeadabdeae..ac7a8b11d799a538c002cd64a2519706e1ba389c 100644 (file)
--- a/src/Cockpit/Makefile.am
+++ b/src/Cockpit/Makefile.am
@@ -13,4 +13,4 @@ libCockpit_a_SOURCES = \
        sp_panel.cxx sp_panel.hxx \
        steam.cxx steam.hxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

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

diff --git a/src/FDM/Balloon/Makefile.am b/src/FDM/Balloon/Makefile.am
index b0697009880f816060a28e012287b6e6cde851f4..2d4ac60c7f539f62bad02f3a811224b2488a2f8c 100644 (file)
--- a/src/FDM/Balloon/Makefile.am
+++ b/src/FDM/Balloon/Makefile.am
@@ -2,4 +2,4 @@ noinst_LIBRARIES = libBalloon.a
 
 libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 5e89b59a335e6e4c8a15bc1fa91d3c4c83d6241c..a5203fca3b2786158dfbcb6e788e199da5fb24ed 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -34,6 +34,6 @@ testJSBsim_SOURCES = JSBSim.cpp
 
 testJSBsim_LDADD = libJSBSim.a filtersjb/libfiltersjb.a
 
-INCLUDES += -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir)/src
 
 DEFS += -DFGFS

diff --git a/src/FDM/JSBSim/filtersjb/Makefile.am b/src/FDM/JSBSim/filtersjb/Makefile.am
index 8c5e09f1fe8b9e4c1c8bbf42741098e3bc8dac15..f6425810159a981d4debeb30d1e4a331ef77d0a1 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/Makefile.am
+++ b/src/FDM/JSBSim/filtersjb/Makefile.am
@@ -12,6 +12,6 @@ libfiltersjb_a_SOURCES = \
        FGSummer.cpp FGSummer.h \
        FGSwitch.cpp FGSwitch.h
 
-INCLUDES += -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir)/src
 
 DEFS += -DFGFS

diff --git a/src/FDM/LaRCsim/Makefile.am b/src/FDM/LaRCsim/Makefile.am
index 8f5ba663ede3f172fd47d98324eb3b22bcef436f..d50daf40204072408d87d5bfcecdf16307f9b655 100644 (file)
--- a/src/FDM/LaRCsim/Makefile.am
+++ b/src/FDM/LaRCsim/Makefile.am
@@ -31,4 +31,4 @@ libLaRCsim_a_SOURCES = \
        $(AIRCRAFT_MODEL) \
        ls_interface.c ls_interface.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/Makefile.am b/src/FDM/Makefile.am
index ff12202fe129867fc61bbd6e9e725dd67328da03..d10e3ac81d0967963207e81e02c77c2d20c00200 100644 (file)
--- a/src/FDM/Makefile.am
+++ b/src/FDM/Makefile.am
@@ -19,4 +19,4 @@ engine_LDADD = libFlight.a
 
 pstest_SOURCES = ps-10520c.cxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/UIUCModel/Makefile.am b/src/FDM/UIUCModel/Makefile.am
index fd15bcefd48219d070c018834abfd63fc356e33e..f5714293fa5730b6e6e6e58e27b564106f82e5aa 100644 (file)
--- a/src/FDM/UIUCModel/Makefile.am
+++ b/src/FDM/UIUCModel/Makefile.am
@@ -47,4 +47,4 @@ libUIUCModel_a_SOURCES = \
                         uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
                         uiuc_wrapper.cpp uiuc_wrapper.h
 
-INCLUDES += -I$(top_builddir) 
+INCLUDES += -I$(top_srcdir) 

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 5d4224413352b24876057742788de46e1448e5a5..927499f878b27a573f39ff8f24570d5aa5c25122 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -2,4 +2,4 @@ noinst_LIBRARIES = libGUI.a
 
 libGUI_a_SOURCES = gui.cxx gui.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Include/config.h.in b/src/Include/config.h.in
index 2962401d4fbd708dab5b56da1624ee6ff3131a6c..13044e031b1abee6c1c9891332449e8b711b9bb2 100644 (file)
--- a/src/Include/config.h.in
+++ b/src/Include/config.h.in
@@ -225,6 +225,9 @@
 /* Define if you have the m library (-lm).  */
 #undef HAVE_LIBM
 
+/* Define if you have the plibul library (-lplibul).  */
+#undef HAVE_LIBPLIBUL
+
 /* Define if you have the pthread library (-lpthread).  */
 #undef HAVE_LIBPTHREAD
 

diff --git a/src/Joystick/Makefile.am b/src/Joystick/Makefile.am
index a0d9801eaa8839110726aef75a2353b0480c00d5..ddbcecbf83c094f7f34d218e5805ed6c3447bc52 100644 (file)
--- a/src/Joystick/Makefile.am
+++ b/src/Joystick/Makefile.am
@@ -6,4 +6,4 @@ noinst_PROGRAMS = js_demo
 
 js_demo_SOURCES = js_demo.cxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 13d700c4f56c9ab76d371b27ddf2a42907162ffb..37bce676aa5300f004b4b7c1e7ebc29dd9711ec4 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -73,4 +73,4 @@ fgfs_LDADD = \
        $(opengl_LIBS) \
        $(audio_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Navaids/Makefile.am b/src/Navaids/Makefile.am
index 1a020e7a3dbc99fb38dc871b2f88d99b7f115576..a024c4113a333ab4f717356c9f5e8394111bc270 100644 (file)
--- a/src/Navaids/Makefile.am
+++ b/src/Navaids/Makefile.am
@@ -10,4 +10,4 @@ libNavaids_a_SOURCES = \
 testnavs_SOURCES = testnavs.cxx
 testnavs_LDADD = libNavaids.a -lsgmath -lsgmisc -lsgdebug -lz
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Network/Makefile.am b/src/Network/Makefile.am
index 305c3363a605bc6c89c1bcbc89033c5ed1cb1b61..7a049e9b3a8625ab98b90b9c029864b2c8aa8876 100644 (file)
--- a/src/Network/Makefile.am
+++ b/src/Network/Makefile.am
@@ -10,4 +10,4 @@ libNetwork_a_SOURCES = \
        rul.cxx rul.hxx \
        joyclient.cxx joyclient.hxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/NetworkOLK/Makefile.am b/src/NetworkOLK/Makefile.am
index 9eb82a8c9e27dca58c6b0c44a210986a4b3abadb..3e19336d55d66ed4a2cf00a35d17b5ffa39bca32 100644 (file)
--- a/src/NetworkOLK/Makefile.am
+++ b/src/NetworkOLK/Makefile.am
@@ -4,4 +4,4 @@ libNetworkOLK_a_SOURCES = \
        net_send.cxx net_hud.cxx network.cxx network.h fgd.h \
        features.cxx features.hxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Objects/Makefile.am b/src/Objects/Makefile.am
index 37e8db67e9895f71bb46103e32872bb65e38f1e8..57ccc7ae7dfc804f83193e6e285b031a8d49ab08 100644 (file)
--- a/src/Objects/Makefile.am
+++ b/src/Objects/Makefile.am
@@ -6,4 +6,4 @@ libObjects_a_SOURCES = \
        obj.cxx obj.hxx \
        texload.c texload.h colours.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Scenery/Makefile.am b/src/Scenery/Makefile.am
index 978e30fd1c8942acfb7618fbb83e9fb49b09d081..2476df6143cfd22d85d94b69b849f5a3d344481f 100644 (file)
--- a/src/Scenery/Makefile.am
+++ b/src/Scenery/Makefile.am
@@ -7,4 +7,4 @@ libScenery_a_SOURCES = \
        tileentry.cxx tileentry.hxx \
        tilemgr.cxx tilemgr.hxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Time/Makefile.am b/src/Time/Makefile.am
index 0ee9bf459ed32e88085c162a8c05ca7e6e5f335c..73ab68e0fd188f9419199bc7e32a32421fbd3521 100644 (file)
--- a/src/Time/Makefile.am
+++ b/src/Time/Makefile.am
@@ -13,4 +13,4 @@ libTime_a_SOURCES = \
        # lowleveltime.cxx lowleveltime.h \
        # timezone.cxx timezone.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Weather/Makefile.am b/src/Weather/Makefile.am
index cb4ba062035ee9b344dbb7f6e71d242b95836042..b4dc076e55b1249b945795f6fa92571825e69e29 100644 (file)
--- a/src/Weather/Makefile.am
+++ b/src/Weather/Makefile.am
@@ -6,4 +6,4 @@ noinst_LIBRARIES = libWeather.a
 
 libWeather_a_SOURCES = weather.cxx weather.hxx
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/WeatherCM/Makefile.am b/src/WeatherCM/Makefile.am
index b5a0b5048a05dbb39561db5ef7964332b03259c9..a3b1e7bc25c1e285214f3b6a0e512f89e657ebf3 100644 (file)
--- a/src/WeatherCM/Makefile.am
+++ b/src/WeatherCM/Makefile.am
@@ -18,4 +18,4 @@ libWeatherCM_a_SOURCES = \
        FGWeatherVectorWrap.h \
        FGWindItem.cpp FGWindItem.h
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/src
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src