From faf91ae9e9fe94e7fabb6bdc29c27b4ecb5b58d2 Mon Sep 17 00:00:00 2001 From: ehofman Date: Thu, 22 Dec 2005 15:13:50 +0000 Subject: [PATCH] Revert to the previous version, this is just a glimps of the future. --- src/Main/Makefile.am | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am index 484837224..d1c884fb2 100644 --- a/src/Main/Makefile.am +++ b/src/Main/Makefile.am @@ -25,16 +25,6 @@ else GFX_CODE = fg_os.cxx fg_os.hxx endif -JSBSIM_LIBS = \ - $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \ - $(top_builddir)/src/FDM/JSBSim/initialization/libInit.a \ - $(top_builddir)/src/FDM/JSBSim/models/libModels.a \ - $(top_builddir)/src/FDM/JSBSim/models/flight_control/libFlightControl.a\ - $(top_builddir)/src/FDM/JSBSim/models/atmosphere/libAtmosphere.a \ - $(top_builddir)/src/FDM/JSBSim/models/propulsion/libPropulsion.a \ - $(top_builddir)/src/FDM/JSBSim/input_output/libInputOutput.a \ - $(top_builddir)/src/FDM/JSBSim/math/libMath.a - AM_CXXFLAGS = -DPKGLIBDIR=\"$(pkgdatadir)\" bin_PROGRAMS = fgfs metar @@ -73,7 +63,7 @@ fgfs_LDADD = \ $(top_builddir)/src/FDM/Balloon/libBalloon.a \ $(top_builddir)/src/FDM/ExternalNet/libExternalNet.a \ $(top_builddir)/src/FDM/ExternalPipe/libExternalPipe.a \ - $(JSBSIM_LIBS) \ + $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \ $(top_builddir)/src/FDM/YASim/libYASim.a \ $(top_builddir)/src/FDM/JSBSim/filtersjb/libfiltersjb.a \ $(top_builddir)/src/FDM/LaRCsim/libLaRCsim.a \ @@ -115,4 +105,4 @@ metar_LDADD = \ -lplibnet -lplibul $(network_LIBS) \ -lz $(base_LIBS) -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim +INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src