Andy Ross wrote:
Erik Hofman wrote:
 > I'll try to see if I can illiminate most of them by only adding the
 > YASim object files required by yasim-test instead of including
 > libYASim as a whole.

OK, I've checked in a Makefile.am that does exactly that.  It still works
for me; is Irix happier?

Yep it does. Thanks for the quick response.

I propose a small change in the Makefile which might make life a little easier in the future, by defining SHARED_SOURCES wich hold (indeed) all the files that are shared between the library and the stand alone interpreter.

Erik
--- /home/erik/src/CVS/fgfs/FlightGear/src/FDM/YASim/Makefile.am        Sat Nov 30 
22:50:13 2002
+++ Makefile.am Sat Nov 30 23:10:11 2002
@@ -1,7 +1,6 @@
 noinst_LIBRARIES = libYASim.a
 
-libYASim_a_SOURCES = \
-        YASim.cxx YASim.hxx \
+SHARED_SOURCES = \
         Airplane.cpp Airplane.hpp \
         Atmosphere.cpp Atmosphere.hpp \
         BodyEnvironment.hpp \
@@ -23,6 +22,8 @@
         Vector.hpp \
         Wing.cpp Wing.hpp
 
+libYASim_a_SOURCES = YASim.cxx YASim.hxx $(SHARED_SOURCES)
+
 bin_PROGRAMS = yasim
 
 # Link the yasim executable against the individual object files rather
@@ -33,27 +34,7 @@
 # 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 \
-        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
+yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCES)
 
 yasim_LDADD = -lsgxml -lsgmisc -lsgdebug
 

Reply via email to