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

This should simplify things tremendously.
This commit is contained in:
curt
1998-01-19 19:27:10 +00:00
parent 61a8afa06a
commit 0dd244fb0c
12 changed files with 66 additions and 188 deletions
+9 -95
View File
@@ -23,103 +23,17 @@
# (Log is kept at end of this file)
#---------------------------------------------------------------------------
ARLIBRARY = libMath.a
TARGETS = $(ARLIBRARY) geotest
TARGET = libMath.a
CFILES = MAT3geom.c MAT3inv.c MAT3mat.c MAT3vec.c fg_geodesy.c fg_random.c polar.c vector.c
CXXFILES =
CFILES = MAT3geom.c MAT3inv.c MAT3mat.c MAT3vec.c fg_geodesy.c fg_random.c \
polar.c vector.c
OFILES = $(CFILES:.c=.o)
LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
include $(FG_ROOT_SRC)/commondefs
include ../make.inc
geotest: geotest.o $(ARLIBRARY)
$(CC) $(LDFLAGS) -o $@ $< -lMath -lm -lc
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
MAT3geom.o:
$(CC) $(CFLAGS) -c $< -o $@
MAT3inv.o:
$(CC) $(CFLAGS) -c $< -o $@
MAT3mat.o:
$(CC) $(CFLAGS) -c $< -o $@
MAT3vec.o:
$(CC) $(CFLAGS) -c $< -o $@
fg_geodesy.o:
$(CC) $(CFLAGS) -c fg_geodesy.c -o $@
fg_random.o:
$(CC) $(CFLAGS) -c fg_random.c -o $@
polar.o:
$(CC) $(CFLAGS) -c polar.c -o $@
vector.o:
$(CC) $(CFLAGS) -c vector.c -o $@
#---------------------------------------------------------------------------
# $Log$
# Revision 1.13 1997/12/22 04:14:33 curt
# Aligned sky with sun so dusk/dawn effects can be correct relative to the sun.
#
# Revision 1.12 1997/07/31 22:52:27 curt
# Working on redoing internal coordinate systems & scenery transformations.
#
# Revision 1.11 1997/07/30 16:04:08 curt
# Moved random routines from Utils/ to Math/
#
# Revision 1.10 1997/07/20 02:19:11 curt
# First stab at a system to generate os2 makefiles automatically.
#
# Revision 1.9 1997/07/12 02:24:46 curt
# Added ranlib.
#
# Revision 1.8 1997/07/07 20:59:48 curt
# Working on scenery transformations to enable us to fly fluidly over the
# poles with no discontinuity/distortion in scenery.
#
# Revision 1.7 1997/07/05 20:43:31 curt
# renamed mat3 directory to Math so we could add other math related routines.
#
# Revision 1.6 1997/06/27 21:38:14 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:38 curt
# Restructuring make, adding automatic "make dep" support.
#
# Revision 1.3 1997/06/25 15:39:49 curt
# Minor changes to compile with rsxnt/win32.
#
# Revision 1.2 1997/05/30 19:30:16 curt
# The LaRCsim flight model is starting to look like it is working.
#
# Revision 1.1 1997/05/30 19:25:56 curt
# The MAT3 routines from SRGP.
include $(COMMONRULES)