Merged in make system changes from Bob Kuehne <rpk@sgi.com>

[flightgear.git] / LaRCsim / Makefile

diff --git a/LaRCsim/Makefile b/LaRCsim/Makefile
index 9b25a2c9c135f63d9295c8aa0cead177a9b2a148..7fd734cd71272a462cd0aa054c5da14001ba450a 100644 (file)
--- a/LaRCsim/Makefile
+++ b/LaRCsim/Makefile
@@ -1,70 +1,15 @@
-#---------------------------------------------------------------------------
-# Makefile
-#
-# Written by Curtis Olson, started May 1997.
-#
-# $Id$
-# (Log is kept at end of this file)
-#---------------------------------------------------------------------------
-
-
-TARGET = libLaRCsim.a
+ARLIBRARY = libLaRCsim.a
+TARGETS = $(ARLIBRARY)
 
 LaRCsimFILES = atmos_62.c ls_accel.c ls_aux.c ls_geodesy.c ls_gravity.c \
-       ls_step.c ls_model.c default_model_routines.c ls_init.c ls_sync.c
-
+        ls_step.c ls_model.c default_model_routines.c ls_init.c # ls_sync.c
 NavionFILES = navion_aero.c navion_engine.c navion_gear.c navion_init.c
-
 InterfaceFILES = ls_interface.c
-
 CFILES =  $(LaRCsimFILES) $(NavionFILES) $(InterfaceFILES)
+CXXFILES = 
 
-OFILES = $(CFILES:.c=.o)
-
-CC = gcc
-CFLAGS = -g
-# CFLAGS = -O2
-
-AR = ar
-
-INCLUDES = 
-
-LIBS = -lm
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
-       $(AR) rv $(TARGET) $(OFILES)
-
-simtest: $(TARGET) LaRCsim.o
-       $(CC) -o simtest LaRCsim.o libLaRCsim.a $(LIBS)
-
-all: $(TARGET)
-
-clean:
-       rm -f *.o $(TARGET) *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
 
+include $(FG_ROOT_SRC)/commondefs
 
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.3  1997/06/21 17:12:50  curt
-# Capitalized subdirectory names.
-#
-# Revision 1.2  1997/06/17 16:52:02  curt
-# Timer interval stuff now uses gettimeofday() instead of ftime()
-#
-# Revision 1.1  1997/05/29 00:09:52  curt
-# Initial Flight Gear revision.
-#
-# Revision 1.1  1997/05/16 16:04:44  curt
-# Initial revision.
-#
+include $(COMMONRULES)