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

[flightgear.git] / Time / Makefile

diff --git a/Time/Makefile b/Time/Makefile
index 7ed2b350e44f00b01d5eb5e21c7de9dc4f400663..576fc01d65b0c475f3fcc9ff73e5a98250e097f4 100644 (file)
--- a/Time/Makefile
+++ b/Time/Makefile
@@ -23,93 +23,14 @@
 # (Log is kept at end of this file)
 #---------------------------------------------------------------------------
 
+ARLIBRARY = libTime.a
+TARGETS = $(ARLIBRARY)
 
-TARGET = libTime.a
+CFILES = event.c fg_time.c fg_timer.c scheduler.c sidereal.c sunpos.c test_event.c ttest.c
+CXXFILES = 
 
-CFILES = event.c fg_time.c fg_timer.c sunpos.c
-OFILES = $(CFILES:.c=.o)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
 
+include $(FG_ROOT_SRC)/commondefs
 
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES)
-       $(AR) rv $(TARGET) $(OFILES)
-       $(RANLIB) $(TARGET)
-
-all: $(TARGET)
-
-clean:
-       rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-event.o:
-       $(CC) $(CFLAGS) -c event.c -o $@
-
-fg_time.o:
-       $(CC) $(CFLAGS) -c fg_time.c -o $@
-
-fg_timer.o:
-       $(CC) $(CFLAGS) -c fg_timer.c -o $@
-
-sunpos.o:
-       $(CC) $(CFLAGS) -c sunpos.c -o $@
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.14  1997/12/30 04:19:22  curt
-# Initial revision.
-#
-# Revision 1.13  1997/09/22 14:44:22  curt
-# Continuing to try to align stars correctly.
-#
-# Revision 1.12  1997/08/06 00:24:31  curt
-# Working on correct real time sun lighting.
-#
-# Revision 1.11  1997/08/01 15:28:44  curt
-# Added sunpos.c
-#
-# Revision 1.10  1997/07/31 22:52:40  curt
-# Working on redoing internal coordinate systems & scenery transformations.
-#
-# Revision 1.9  1997/07/20 02:19:12  curt
-# First stab at a system to generate os2 makefiles automatically.
-#
-# Revision 1.8  1997/07/14 16:26:05  curt
-# Testing/playing -- placed objects randomly across the entire terrain.
-#
-# Revision 1.7  1997/07/12 02:24:48  curt
-# Added ranlib.
-#
-# Revision 1.6  1997/06/27 21:38:13  curt
-# Working on Makefile structure.
-#
-# Revision 1.5  1997/06/27 20:03:40  curt
-# Working on Makefile structure.
-#
-# Revision 1.4  1997/06/26 19:08:37  curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.3  1997/06/25 17:46:58  curt
-# Make itimer support optional.
-#
-# Revision 1.2  1997/06/21 17:12:55  curt
-# Capitalized subdirectory names.
-#
-# Revision 1.1  1997/06/16 19:24:19  curt
-# Initial revision.
-#
+include $(COMMONRULES)