Changed naming scheme of basic shared structures.

[flightgear.git] / Scenery / Makefile

diff --git a/Scenery/Makefile b/Scenery/Makefile
index 5ec7f8996cc1879efe4517a5c0e2af6b16204d25..f6ebee5ddf0196bb69cb6821bc610898e8d0c567 100644 (file)
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -26,69 +26,114 @@
 
 TARGET = libScenery.a
 
-CFILES = scanner.c parser.c common.c mesh.c
-HFILES = 
-LFILES = scanner.l
-YFILES = parser.y
+CFILES = chunkmgr.c common.c mesh.c scenery.c scanner.c parser.c geometry.c \
+       stars.c
 OFILES = $(CFILES:.c=.o)
 
-CC = gcc
-CFLAGS = -g -Wall
-# CFLAGS = -O2 -Wall
 
-FLEX = flex -f -L
-BISON = bison -v --no-lines
-AR = ar
+include ../make.inc
 
-INCLUDES = 
 
-LIBS = -lfl
+CFLAGS = $(FG_CFLAGS)
 
 
 #---------------------------------------------------------------------------
 # Primary Targets
 #---------------------------------------------------------------------------
 
-all: $(TARGET)
-
-$(TARGET): $(OFILES) $(HFILES)
+$(TARGET): $(OFILES) $(HFILES) 
        $(AR) rv $(TARGET) $(OFILES)
+       $(RANLIB) $(TARGET)
+
+all: $(TARGET)
 
 clean:
-       rm -f *.o $(TARGET) parser.output *~ core
+       rm -f *.o $(TARGET) lib*.a *.os2 *~ core
 
 realclean: clean
-       rm -f scanner.c parser.c
+       rm -f scanner.c parser.c parser.h parser.output
 
 
 #---------------------------------------------------------------------------
 # Secondary Targets
 #---------------------------------------------------------------------------
 
+include depend
+
 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
+parser.c: parser.y 
        $(BISON) -o parser.c parser.y
 
+scanner.o: scanner.c
+       $(CC) $(CFLAGS) -c scanner.c -o $@
+
 parser.o: parser.c
-       $(CC) $(CFLAGS) -c parser.c
+       $(CC) $(CFLAGS) -c parser.c -o $@
+
+chunkmgr.o:
+       $(CC) $(CFLAGS) -c chunkmgr.c -o $@
 
-common.o: common.c common.h
-       $(CC) $(CFLAGS) -c common.c
+common.o:
+       $(CC) $(CFLAGS) -c common.c -o $@
 
-mesh.o: mesh.c mesh.h common.h
-       $(CC) $(CFLAGS) -c mesh.c
+mesh.o:
+       $(CC) $(CFLAGS) -c mesh.c -o $@
 
+mesh2GL.o:
+       $(CC) $(CFLAGS) -c mesh2GL.c -o $@
+
+scenery.o:
+       $(CC) $(CFLAGS) -c scenery.c -o $@
+
+geometry.o:
+       $(CC) $(CFLAGS) -c geometry.c -o $@
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.19  1997/08/27 03:30:23  curt
+# Changed naming scheme of basic shared structures.
+#
+# Revision 1.18  1997/08/02 19:10:12  curt
+# Incorporated mesh2GL.c into mesh.c
+#
+# Revision 1.17  1997/07/23 21:52:23  curt
+# Put comments around the text after an #endif for increased portability.
+#
+# Revision 1.16  1997/07/20 02:19:11  curt
+# First stab at a system to generate os2 makefiles automatically.
+#
+# Revision 1.15  1997/07/12 02:24:47  curt
+# Added ranlib.
+#
+# Revision 1.14  1997/06/29 21:16:47  curt
+# More twiddling with the Scenery Management system.
+#
+# Revision 1.13  1997/06/27 21:38:10  curt
+# Working on Makefile structure.
+#
+# 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.
 #