Build only static libraries.

diff --git a/Aircraft/Makefile.am b/Aircraft/Makefile.am
index 8da66cc3015e822b3498cc86c07cf0853e1a1a10..c3e60f0f8cd3904b0a579d2ccce6991ee6e6a928 100644 (file)
--- a/Aircraft/Makefile.am
+++ b/Aircraft/Makefile.am
@@ -1,6 +1,5 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libAircraft.a
 
-lib_LTLIBRARIES = libAircraft.la
-libAircraft_la_SOURCES = aircraft.c aircraft.h
+libAircraft_a_SOURCES = aircraft.c aircraft.h
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

diff --git a/Astro/Makefile.am b/Astro/Makefile.am
index 4c7a2075e99ebc63c250591222473f28f8a55c3b..0c835ceeb0624367bf3898bd05b5d385808b9323 100644 (file)
--- a/Astro/Makefile.am
+++ b/Astro/Makefile.am
@@ -1,7 +1,6 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libAstro.a
 
-lib_LTLIBRARIES = libAstro.la
-libAstro_la_SOURCES = \
+libAstro_a_SOURCES = \
        moon.cxx moon.hxx \
        orbits.cxx orbits.hxx \
        planets.cxx planets.hxx \

diff --git a/Autopilot/Makefile.am b/Autopilot/Makefile.am
index 5ec208b05c9f240baf27c64237db8979d19ec39f..4a1a9d5b5f2024a6fa622a5ce438f2b609f054f0 100644 (file)
--- a/Autopilot/Makefile.am
+++ b/Autopilot/Makefile.am
@@ -1,7 +1,5 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libAutopilot.a
 
-lib_LTLIBRARIES = libAutopilot.la
-
-libAutopilot_la_SOURCES = autopilot.c autopilot.h
+libAutopilot_a_SOURCES = autopilot.c autopilot.h
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

diff --git a/Controls/Makefile.am b/Controls/Makefile.am
index 83d27869bc914fab6926963ed9771e08dd81171f..fea2585dfdef8996e4b4a0df7e8b8ccab7acaa4b 100644 (file)
--- a/Controls/Makefile.am
+++ b/Controls/Makefile.am
@@ -1,7 +1,5 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libControls.a
 
-lib_LTLIBRARIES = libControls.la
-
-libControls_la_SOURCES = controls.c controls.h
+libControls_a_SOURCES = controls.c controls.h
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator

diff --git a/FDM/Makefile.am b/FDM/Makefile.am
index 1e0af44a6206e2d74aa213a31d886a8090ab3d01..80ad393be9d62f62ba885d742ef66700ae0ab539 100644 (file)
--- a/FDM/Makefile.am
+++ b/FDM/Makefile.am
@@ -1,9 +1,7 @@
 SUBDIRS        = LaRCsim Slew
 
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libFlight.a
 
-lib_LTLIBRARIES = libFlight.la
-
-libFlight_la_SOURCES = flight.c flight.h
+libFlight_a_SOURCES = flight.c flight.h
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

diff --git a/Joystick/Makefile.am b/Joystick/Makefile.am
index 51b18153a00e3604a853c38bdec2e9ab1ca1e3bf..92442a608707b107e80ec5c8db72cb91fb23799e 100644 (file)
--- a/Joystick/Makefile.am
+++ b/Joystick/Makefile.am
@@ -1,7 +1,5 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libJoystick.a
 
-lib_LTLIBRARIES = libJoystick.la
-
-libJoystick_la_SOURCES = joystick.c joystick.h
+libJoystick_a_SOURCES = joystick.c joystick.h
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Simulator

diff --git a/LaRCsim/Makefile.am b/LaRCsim/Makefile.am
index 0a8d74b06916ed9f4f30610e64f3d3557ea33b87..e9425bfda25fe53e61f967bc88dd21c66081d9fe 100644 (file)
--- a/LaRCsim/Makefile.am
+++ b/LaRCsim/Makefile.am
@@ -1,8 +1,6 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libLaRCsim.a
 
-lib_LTLIBRARIES = libLaRCsim.la
-
-libLaRCsim_la_SOURCES = \
+libLaRCsim_a_SOURCES = \
        atmos_62.c atmos_62.h \
        default_model_routines.c default_model_routines.h \
        ls_accel.c ls_accel.h \

diff --git a/Slew/Makefile.am b/Slew/Makefile.am
index 570ff85a99785b0230213d7ff1e48a5f69dce2ea..4109b2923eff01d3c7bc52d5ec26594aa45972a0 100644 (file)
--- a/Slew/Makefile.am
+++ b/Slew/Makefile.am
@@ -1,7 +1,5 @@
-libdir = ${exec_prefix}/lib
+noinst_LIBRARIES = libSlew.a
 
-lib_LTLIBRARIES = libSlew.la
-
-libSlew_la_SOURCES = slew.c slew.h
+libSlew_a_SOURCES = slew.c slew.h
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator