Tweaks to Gnu automake/autoconf system.

[flightgear.git] / LaRCsim / Makefile.in

diff --git a/LaRCsim/Makefile.in b/LaRCsim/Makefile.in
index 3b5bf0c8a284f155918355f0af98e71c3495af7d..3a6c4f11d44328d08bdcc441f13ff497cbf0263b 100644 (file)
--- a/LaRCsim/Makefile.in
+++ b/LaRCsim/Makefile.in
@@ -72,25 +72,32 @@ VERSION = @VERSION@
 
 libdir = ${exec_prefix}/lib
 
-LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \
-        ls_step.c ls_matrix.c ls_model.c default_model_routines.c ls_init.c
-#      ls_trim.c
-
-NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c
-InterfaceFILES = ls_interface.c
-
 lib_LTLIBRARIES = libLaRCsim.la
+
 libLaRCsim_la_SOURCES = \
-       $(LaRCsimFILES) \
-       $(NavionFILES) \
-       $(InterfaceFILES)
+       atmos_62.c atmos_62.h \
+       default_model_routines.c default_model_routines.h \
+       ls_accel.c ls_accel.h \
+       ls_aux.c ls_aux.h \
+       ls_cockpit.h ls_constants.h ls_generic.h \
+       ls_geodesy.c ls_geodesy.h \
+       ls_gravity.c ls_gravity.h \
+       ls_init.c ls_init.h \
+       ls_matrix.c ls_matrix.h \
+       ls_model.c ls_model.h \
+       ls_sim_control.h \
+        ls_step.c ls_step.h \
+       ls_sym.h ls_types.h \
+       navion_aero.c navion_engine.c navion_gear.c \
+       navion_init.c navion_init.h \
+       ls_interface.c ls_interface.h
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../../Src/Include/config.h
+CONFIG_HEADER = ../../../Simulator/Include/config.h
 CONFIG_CLEAN_FILES = 
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Src/Include
+DEFS = @DEFS@ -I. -I$(srcdir) -I../../../Simulator/Include
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -100,9 +107,9 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 libLaRCsim_la_LDFLAGS = 
 libLaRCsim_la_LIBADD = 
-libLaRCsim_la_OBJECTS =  atmos_62.lo ls_accel.lo ls_aux.lo ls_geodesy.lo \
-ls_gravity.lo ls_step.lo ls_matrix.lo ls_model.lo \
-default_model_routines.lo ls_init.lo navion_aero.lo navion_engine.lo \
+libLaRCsim_la_OBJECTS =  atmos_62.lo default_model_routines.lo \
+ls_accel.lo ls_aux.lo ls_geodesy.lo ls_gravity.lo ls_init.lo \
+ls_matrix.lo ls_model.lo ls_step.lo navion_aero.lo navion_engine.lo \
 navion_gear.lo navion_init.lo ls_interface.lo
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -128,7 +135,7 @@ all: Makefile $(LTLIBRARIES)
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu Src/Flight/LaRCsim/Makefile
+       cd $(top_srcdir) && $(AUTOMAKE) --gnu Simulator/Flight/LaRCsim/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
@@ -222,14 +229,14 @@ maintainer-clean-tags:
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 
-subdir = Src/Flight/LaRCsim
+subdir = Simulator/Flight/LaRCsim
 
 distdir: $(DISTFILES)
        here=`cd $(top_builddir) && pwd`; \
        top_distdir=`cd $(top_distdir) && pwd`; \
        distdir=`cd $(distdir) && pwd`; \
        cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Src/Flight/LaRCsim/Makefile
+         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Simulator/Flight/LaRCsim/Makefile
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          test -f $(distdir)/$$file \