Changed #ifdef FILE_H to #ifdef _FILE_H

[flightgear.git] / Scenery / Makefile

diff --git a/Scenery/Makefile b/Scenery/Makefile
index 491a592125a966742c77b141f6e4707bfa061fb5..87786dc632f70f4187b681ed7444bb65e406e2e5 100644 (file)
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -24,116 +24,15 @@
 #---------------------------------------------------------------------------
 
 
-TARGET = libScenery.a
+ARLIBRARY = libScenery.a
+TARGETS = $(ARLIBRARY)
 
-CFILES = common.c mesh.c scenery.c scanner.c parser.c geometry.c
-HFILES = 
-OFILES = $(CFILES:.c=.o)
+CFILES = common.c geometry.c mesh.c obj.c scenery.c texload.c \
+       tilemgr.c tileutils.c
+CXXFILES = 
 
+LDIRT = $(FG_ROOT_LIB)/$(ARLIBRARY)
 
-include ../make.inc
+include $(FG_ROOT_SRC)/commondefs
 
-
-CFLAGS = $(FG_CFLAGS)
-
-
-#---------------------------------------------------------------------------
-# Primary Targets
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OFILES) $(HFILES) 
-       $(AR) rv $(TARGET) $(OFILES)
-       $(RANLIB) $(TARGET)
-
-all: $(TARGET)
-
-clean:
-       rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-realclean: clean
-       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
-
-parser.h: parser.y
-       $(BISON) -o parser.c -d parser.y
-
-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 -o $@
-
-common.o:
-       $(CC) $(CFLAGS) -c common.c -o $@
-
-mesh.o:
-       $(CC) $(CFLAGS) -c mesh.c -o $@
-
-scenery.o:
-       $(CC) $(CFLAGS) -c scenery.c -o $@
-
-geometry.o:
-       $(CC) $(CFLAGS) -c geometry.c -o $@
-
-#---------------------------------------------------------------------------
-# $Log$
-# 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.
-#
-# 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)