New automake, new problems. Add $base_LIBS for programs since $LIBS isn't substituted...

diff --git a/src/Airports/Makefile.am b/src/Airports/Makefile.am
index e57e0ed16c7522142059f337c7b471428db219cf..c7ed3669bee4eae695c557fdcd61080b458d4333 100644 (file)
--- a/src/Airports/Makefile.am
+++ b/src/Airports/Makefile.am
@@ -7,6 +7,6 @@ libAirports_a_SOURCES = \
        simple.cxx simple.hxx
 
 calc_loc_SOURCES = calc_loc.cxx
-calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz
+calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/YASim/Makefile.am b/src/FDM/YASim/Makefile.am
index f74548c99b4e7cfa4720e34ac7063a13fbe811cb..abff0d1b05698ec88730a7da7ecf14a97f0418c8 100644 (file)
--- a/src/FDM/YASim/Makefile.am
+++ b/src/FDM/YASim/Makefile.am
@@ -1,30 +1,3 @@
-noinst_LIBRARIES = libYASim.a
-
-libYASim_a_SOURCES = \
-        YASim.cxx YASim.hxx \
-        Airplane.cpp Airplane.hpp \
-        Atmosphere.cpp Atmosphere.hpp \
-        BodyEnvironment.hpp \
-        ControlMap.cpp ControlMap.hpp \
-        FGFDM.cpp FGFDM.hpp \
-        Gear.cpp Gear.hpp \
-        Glue.cpp Glue.hpp \
-        Integrator.cpp Integrator.hpp \
-        Jet.cpp Jet.hpp \
-        Math.cpp Math.hpp \
-        Model.cpp Model.hpp \
-        PistonEngine.cpp PistonEngine.hpp \
-        PropEngine.cpp PropEngine.hpp \
-        Propeller.cpp Propeller.hpp \
-        RigidBody.cpp RigidBody.hpp \
-        SimpleJet.cpp SimpleJet.hpp \
-        Surface.cpp Surface.hpp \
-        Thruster.cpp Thruster.hpp \
-        Vector.hpp \
-        Wing.cpp Wing.hpp
-
-bin_PROGRAMS = yasim
-
 # Link the yasim executable against the individual object files rather
 # than libYASim.  The library references other stuff in FlightGear,
 # and some linkers (Irix) do dependency checks per-library instead of
@@ -33,7 +6,7 @@ bin_PROGRAMS = yasim
 # I think that it's permissible to list the same source files more
 # than once in a Makefile.am.  Hopefully this doesn't break anything.
 
-yasim_SOURCES = yasim-test.cpp \
+SHARED_SOURCES = \
         Airplane.cpp Airplane.hpp \
         Atmosphere.cpp Atmosphere.hpp \
         BodyEnvironment.hpp \
@@ -55,6 +28,14 @@ yasim_SOURCES = yasim-test.cpp \
         Vector.hpp \
         Wing.cpp Wing.hpp
 
-yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug
+noinst_LIBRARIES = libYASim.a
+
+libYASim_a_SOURCES = YASim.cxx YASim.hxx $(SHARED_SOURCES)
+
+bin_PROGRAMS = yasim
+
+yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCES)
+
+yasim_LDADD = -lsgxml -lsgprops -lsgmisc -lsgdebug $(base_LIBS)
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Navaids/Makefile.am b/src/Navaids/Makefile.am
index 36efadf08c186994e06be93eb24469e849ed5f3f..786f1b6b04f7e4ab067158c6c5fc18291832a9d7 100644 (file)
--- a/src/Navaids/Makefile.am
+++ b/src/Navaids/Makefile.am
@@ -12,6 +12,6 @@ testnavs_SOURCES = testnavs.cxx
 testnavs_LDADD = \
        libNavaids.a \
        -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
-       -lz
+       $(base_LIBS) -lz
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fb974b3736fc18ec87a3f95307106dd034c92c09..2f9b2feed9e1af6f2de61f1bec7e5da6ae18bc38 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,4 +17,4 @@ test_mktime_SOURCES = test-mktime.cxx
 test_text_SOURCES = test-text.cxx
 
 test_up_SOURCES = test-up.cxx
-test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul
+test_up_LDADD = -lsgmath -lsgdebug -lplibsg -lplibul $(base_LIBS)