Working on Makefile structure.

[flightgear.git] / Scenery / Makefile

diff --git a/Scenery/Makefile b/Scenery/Makefile
index b0e0e3a87516c92ac1213de0b416249de563f059..aa230a8099edc5d151a4e90b466c902e0bd249c6 100644 (file)
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -26,28 +26,26 @@
 
 TARGET = libScenery.a
 
-CFILES = common.c mesh.c
+CFILES = common.c mesh.c scenery.c
 HFILES = 
 OFILES = $(CFILES:.c=.o)
 
-CC = gcc
-CFLAGS = -g -Wall
-# CFLAGS = -O2 -Wall
 
-AR = ar
+include ../make.inc
 
-INCLUDES = 
+
+CFLAGS = $(FG_CFLAGS)
 
 
 #---------------------------------------------------------------------------
 # Primary Targets
 #---------------------------------------------------------------------------
 
-all: $(TARGET)
-
 $(TARGET): $(OFILES) $(HFILES)
        $(AR) rv $(TARGET) $(OFILES)
 
+all: $(TARGET)
+
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
 
@@ -56,15 +54,32 @@ clean:
 # Secondary Targets
 #---------------------------------------------------------------------------
 
-common.o: common.c common.h
+include depend
+
+common.o:
        $(CC) $(CFLAGS) -c common.c
 
-mesh.o: mesh.c mesh.h common.h
+mesh.o:
        $(CC) $(CFLAGS) -c mesh.c
 
+scenery.o:
+       $(CC) $(CFLAGS) -c scenery.c
+
 
 #---------------------------------------------------------------------------
 # $Log$
+# 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.
 #