Lots of updates to get back in sync with changes made over in .../Src/

[flightgear.git] / Tri2obj / Makefile

diff --git a/Tri2obj/Makefile b/Tri2obj/Makefile
index 9e4025bf1c814101a524a5f992176d47e9b9876d..abc733a8939838cfe479d2391a8e9c4836a7a2b2 100644 (file)
--- a/Tri2obj/Makefile
+++ b/Tri2obj/Makefile
@@ -27,45 +27,34 @@
 TARGET = tri2obj
 
 CFILES = tri2obj.c
-OFILES = $(CFILES:.c=.o)
+LDLIBS = -lMath -lScenery -lm
 
 
-include ../make.inc
-
-
-CFLAGS = $(FG_CFLAGS) -g
+include $(FG_ROOT_SRC)/commondefs
 
 
 #---------------------------------------------------------------------------
 # Primary Targets
 #---------------------------------------------------------------------------
 
-all: $(TARGET)
+$(TARGET): $(OBJECTS)
+       $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(LDLIBS)
 
-$(TARGET): $(OFILES)
-       $(CC) $(OFILES) -o $(TARGET) ../../Src/Math/libMath.a -lm
 
-clean:
-       rm -f *.o $(TARGET) lib*.a *.os2 *~ core
-
-realclean: clean
-
-
-#---------------------------------------------------------------------------
-# Secondary Targets
-#---------------------------------------------------------------------------
-
-makedepend:
-       $(CC) -MM *.c > depend
-
-include depend
-
-tri2obj.o: tri2obj.c
-       $(CC) $(CFLAGS) -c tri2obj.c -o $@
+include $(COMMONRULES)
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.5  1998/01/21 02:55:56  curt
+# Incorporated new make system from Bob Kuehne <rpk@sgi.com>.
+#
+# Revision 1.4  1998/01/17 01:25:39  curt
+# Added support for shared normals.
+#
+# Revision 1.3  1997/12/02 13:13:32  curt
+# Fixed problem with averaged vertex normals.
+#
 # Revision 1.2  1997/11/14 00:29:13  curt
 # Transform scenery coordinates at this point in pipeline when scenery is
 # being translated to .obj format, not when it is being loaded into the end