Sync. w. JSBSim cvs

[flightgear.git] / src / FDM / JSBSim / models / propulsion / Makefile.am

diff --git a/src/FDM/JSBSim/models/propulsion/Makefile.am b/src/FDM/JSBSim/models/propulsion/Makefile.am
index 9a5f0a2e4b387e5f5eaa17a3958c946dd2c4ff04..e5b9dcc0fbc02455fa0ef3a72d22273357729914 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/Makefile.am
+++ b/src/FDM/JSBSim/models/propulsion/Makefile.am
@@ -1,22 +1,12 @@
-includedir = @includedir@/JSBSim/models/propulsion
+noinst_LIBRARIES = libPropulsion.a
 
-LIBRARY_SOURCES = FGElectric.cpp FGEngine.cpp FGForce.cpp FGNozzle.cpp \
-                         FGPiston.cpp FGPropeller.cpp FGRocket.cpp \
+libPropulsion_a_SOURCES = \
+                         FGElectric.cpp FGEngine.cpp FGForce.cpp FGNozzle.cpp \
+                         FGPiston.cpp FGPropeller.cpp FGRocket.cpp FGRotor.cpp \
                          FGTank.cpp FGThruster.cpp FGTurbine.cpp FGTurboProp.cpp
 
-LIBRARY_INCLUDES = FGElectric.h FGEngine.h FGForce.h FGNozzle.h FGPiston.h \
-                  FGPropeller.h FGRocket.h FGTank.h FGThruster.h \
+noinst_HEADERS = FGElectric.h FGEngine.h FGForce.h FGNozzle.h FGPiston.h \
+                  FGPropeller.h FGRocket.h FGRotor.h FGTank.h FGThruster.h \
                   FGTurbine.h FGTurboProp.h
 
-if BUILD_LIBRARIES
-noinst_LTLIBRARIES = libPropulsion.la
-include_HEADERS = $(LIBRARY_INCLUDES)
-libPropulsion_la_SOURCES = $(LIBRARY_SOURCES)
-libPropulsion_la_CXXFLAGS = $(AM_CXXFLAGS)
-else
-noinst_LIBRARIES = libPropulsion.a
-noinst_HEADERS = $(LIBRARY_INCLUDES)
-libPropulsion_a_SOURCES = $(LIBRARY_SOURCES)
-endif
-
-INCLUDES = -I$(top_srcdir)/src -I../../
+INCLUDES = -I$(top_srcdir)/src/FDM/JSBSim