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

[flightgear.git] / Scenery / Makefile

diff --git a/Scenery/Makefile b/Scenery/Makefile
index 25b1ed28952a65a5b301bc4401cf86180a65a2d6..cd0787ec036a41bce01ebf87f9484e970dcd6e75 100644 (file)
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -23,78 +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 = scanner.c parser.c common.c mesh.c
-HFILES = 
-LFILES = scanner.l
-YFILES = parser.y
-OFILES = $(CFILES:.c=.o)
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
 
-CC = gcc
-CFLAGS = -g -Wall
-# CFLAGS = -O2 -Wall
+include $(FG_ROOT_SRC)/commondefs
 
-FLEX = flex -f
-BISON = bison -v
-AR = ar
-
-INCLUDES = 
-
-LIBS = -lfl
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-all: $(TARGET)
-
-$(TARGET): $(OFILES) $(HFILES)
-       $(AR) rv $(TARGET) $(OFILES)
-
-clean:
-       rm -f *.o $(TARGET) parser.output *~ core
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-scanner.c: scanner.l parser.h
-       $(FLEX) -oscanner.c scanner.l
-
-scanner.o: scanner.c
-       $(CC) $(CFLAGS) -c scanner.c
-
-parser.h: parser.y
-       $(BISON) -o parser.c -d parser.y
-
-parser.c: parser.y common.h mesh.h scenery.h
-       $(BISON) -o parser.c parser.y
-
-parser.o: parser.c
-       $(CC) $(CFLAGS) -c parser.c
-
-common.o: common.c common.h
-       $(CC) $(CFLAGS) -c common.c
-
-mesh.o: mesh.c mesh.h common.h
-       $(CC) $(CFLAGS) -c mesh.c
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# 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)