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

[flightgear.git] / Scenery / Makefile

diff --git a/Scenery/Makefile b/Scenery/Makefile
index ec441d6ecae109c38dcfa0edf56d483dccabf5e6..cd0787ec036a41bce01ebf87f9484e970dcd6e75 100644 (file)
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -23,88 +23,14 @@
 # (Log is kept at end of this file)
 #---------------------------------------------------------------------------
 
+ARLIBRARY = libScenery.a
+TARGETS = $(ARLIBRARY)
 
-TARGET = libScenery.a
+CFILES = common.c geometry.c mesh.c obj.c scenery.c tilemgr.c tileutils.c
+CXXFILES = 
 
-CFILES = common.c mesh.c scenery.c
-HFILES = 
-OFILES = $(CFILES:.c=.o)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
 
-CC = gcc
-CFLAGS = $(FG_CFLAGS)
+include $(FG_ROOT_SRC)/commondefs
 
-AR = ar
-
-INCLUDES = 
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES) $(HFILES)
-       $(AR) rv $(TARGET) $(OFILES)
-
-all: $(TARGET)
-
-# depend:
-#      $(CC) -MM *.c > depend                     
-
-clean:
-       rm -f *.o $(TARGET) lib*.a *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-include depend
-
-common.o:
-       $(CC) $(CFLAGS) -c common.c
-
-mesh.o:
-       $(CC) $(CFLAGS) -c mesh.c
-
-scenery.o:
-       $(CC) $(CFLAGS) -c scenery.c
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.12  1997/06/27 20:03:37  curt
-# Working on Makefile structure.
-#
-# Revision 1.11  1997/06/26 22:14:57  curt
-# Beginning work on a scenery management system.
-#
-# Revision 1.10  1997/06/26 19:08:34  curt
-# Restructuring make, adding automatic "make dep" support.
-#
-# Revision 1.9  1997/06/25 15:39:48  curt
-# Minor changes to compile with rsxnt/win32.
-#
-# Revision 1.8  1997/06/21 17:58:07  curt
-# directory shuffling ...
-#
-# Revision 1.1  1997/06/21 17:39:28  curt
-# Moved to the ParseScn subdirectory.
-#
-# Revision 1.6  1997/06/21 17:12:55  curt
-# Capitalized subdirectory names.
-#
-# Revision 1.5  1997/05/31 19:16:29  curt
-# Elevator trim added.
-#
-# Revision 1.4  1997/05/27 17:48:50  curt
-# Added -f flag to flex to generate a "fast" scanner.
-#
-# Revision 1.3  1997/05/23 15:40:40  curt
-# Added GNU copyright headers.
-#
-# Revision 1.2  1997/05/17 00:17:01  curt
-# Cosmetic changes.
-#
-# Revision 1.1  1997/05/16 16:07:02  curt
-# Initial revision.
-#
+include $(COMMONRULES)