Working on Makefile structure.

diff --git a/Aircraft/Makefile b/Aircraft/Makefile
index e554c8618a0e966e34b74e85681b40bf9b28c885..afc9813c5e291d43b4ab6ecc87121c2f97f57ec5 100644 (file)
--- a/Aircraft/Makefile
+++ b/Aircraft/Makefile
@@ -49,8 +49,8 @@ $(TARGET): $(OFILES) $(HFILES)
 
 all: $(TARGET)
 
-dep:                                 
-       $(CC) -MM *.c > depend                     
+# depend:                                 
+#      $(CC) -MM *.c > depend                     
 
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
@@ -68,6 +68,9 @@ aircraft.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.6  1997/06/27 20:03:32  curt
+# Working on Makefile structure.
+#
 # Revision 1.5  1997/06/26 19:08:28  curt
 # Restructuring make, adding automatic "make dep" support.
 #

diff --git a/Controls/Makefile b/Controls/Makefile
index 7315b7ade05d8c563793090294b0cb7876cc267d..be947260700d1e40383258cb062f172a4f747ce7 100644 (file)
--- a/Controls/Makefile
+++ b/Controls/Makefile
@@ -49,8 +49,8 @@ $(TARGET): $(OFILES)
 
 all: $(TARGET)
 
-dep:                                 
-       $(CC) -MM *.c > depend                     
+# depend:
+#      $(CC) -MM *.c > depend                     
 
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
@@ -68,6 +68,9 @@ controls.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.7  1997/06/27 20:03:33  curt
+# Working on Makefile structure.
+#
 # Revision 1.6  1997/06/26 19:08:29  curt
 # Restructuring make, adding automatic "make dep" support.
 #

diff --git a/FDM/Makefile b/FDM/Makefile
index 0082de4e83dc4899511440d5c1301c2cdfed5fb5..7cf767656d954bbbc8a688b319f8897424a6dea5 100644 (file)
--- a/FDM/Makefile
+++ b/FDM/Makefile
@@ -48,8 +48,10 @@ $(TARGET): $(OFILES)
 
 all: $(TARGET)
 
-dep:                                 
-       $(CC) -MM *.c > depend                     
+# depend:
+#      $(CC) -MM *.c > depend                     
+
+dep: depend
 
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
@@ -67,6 +69,9 @@ flight.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.7  1997/06/27 20:03:34  curt
+# Working on Makefile structure.
+#
 # Revision 1.6  1997/06/26 19:08:30  curt
 # Restructuring make, adding automatic "make dep" support.
 #

diff --git a/LaRCsim/Makefile b/LaRCsim/Makefile
index d8c527375bc8a261b92931ec8f50dbf0e1e0de7d..bad4f76626ad8ac3dbdbc98e081b163b5ab517b5 100644 (file)
--- a/LaRCsim/Makefile
+++ b/LaRCsim/Makefile
@@ -43,8 +43,8 @@ simtest: $(TARGET) LaRCsim.o
 
 all: $(TARGET)
 
-dep:                                 
-       $(CC) -MM *.c > depend                     
+# depend:
+#      $(CC) -MM *.c > depend
 
 clean:
        rm -f *.o $(TARGET) *~ core
@@ -59,6 +59,9 @@ include depend
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.5  1997/06/27 20:03:34  curt
+# Working on Makefile structure.
+#
 # Revision 1.4  1997/06/26 19:08:30  curt
 # Restructuring make, adding automatic "make dep" support.
 #

diff --git a/Main/Makefile b/Main/Makefile
index 2abde6fc1deea8c28b6b52f087d6aa551e37b68b..bd93c679a2e3e239f876d16ddd9baf0dfbe9d480 100644 (file)
--- a/Main/Makefile
+++ b/Main/Makefile
@@ -79,8 +79,8 @@ $(TARGET): $(OFILES) $(AFILES)
 
 all: $(TARGET)
 
-dep:
-       $(CC) -MM *.c > depend
+# depend:
+#      $(CC) -MM *.c > depend
 
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
@@ -107,6 +107,9 @@ mesh2GL.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.18  1997/06/27 20:03:36  curt
+# Working on Makefile structure.
+#
 # Revision 1.17  1997/06/26 22:14:54  curt
 # Beginning work on a scenery management system.
 #

diff --git a/Scenery/Makefile b/Scenery/Makefile
index 65625edf65fca2f25d42968fe9f13f2509c0d34f..ec441d6ecae109c38dcfa0edf56d483dccabf5e6 100644 (file)
--- a/Scenery/Makefile
+++ b/Scenery/Makefile
@@ -47,8 +47,8 @@ $(TARGET): $(OFILES) $(HFILES)
 
 all: $(TARGET)
 
-dep:                                 
-       $(CC) -MM *.c > depend                     
+# depend:
+#      $(CC) -MM *.c > depend                     
 
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
@@ -72,6 +72,9 @@ scenery.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# 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.
 #

diff --git a/Scenery/scenery.c b/Scenery/scenery.c
index 9a234fb613dfe6b34cd0c107e79cb6582bcdd481..96c58ec06d788c7270e4b3974e95c8a381e6fb33 100644 (file)
--- a/Scenery/scenery.c
+++ b/Scenery/scenery.c
@@ -25,7 +25,7 @@
 
 
 #include "scenery.h"
-#include "ParseVrml/parsevrml.h"
+#include "ParseVRML/parsevrml.h"
 
 
 /* Initialize the Scenery Management system */
@@ -51,7 +51,10 @@ void fgSceneryRender() {
 
 
 /* $Log$
-/* Revision 1.1  1997/06/27 02:26:30  curt
-/* Initial revision.
+/* Revision 1.2  1997/06/27 20:03:37  curt
+/* Working on Makefile structure.
 /*
+ * Revision 1.1  1997/06/27 02:26:30  curt
+ * Initial revision.
+ *
  */

diff --git a/Simulator/Makefile b/Simulator/Makefile
index eaf1bc3d6b6cb2318e3a2d2f5052c9ca6de11802..d59dddae5be3806a8c3fed755bd08d90dde107e4 100644 (file)
--- a/Simulator/Makefile
+++ b/Simulator/Makefile
@@ -98,7 +98,7 @@ export INTERFACE_FLAGS INTERFACE_LIBS GRAPHICS_LIBS
 # You shouldn't need to modify anything beyond this point
 #---------------------------------------------------------------------------
 
-SUBSUBDIRS = Flight/LaRCsim Flight/Slew Scenery/ParseScn Scenery/ParseVrml
+SUBSUBDIRS = Flight/LaRCsim Flight/Slew Scenery/ParseScn Scenery/ParseVRML
 SUBDIRS = Aircraft Controls Flight mat3 Scenery Timer
 MAIN = OpenGL
 
@@ -111,12 +111,20 @@ all:
            ( cd $$dir; $(MAKE) ) ; \
        done
 
+depend:
+       for dir in $(SUBSUBDIRS) $(SUBDIRS); do \
+           ( cd $$dir; $(MAKE) depend ) ; \
+       done
+       for dir in $(MAIN); do \
+           ( cd $$dir; $(MAKE) depend ) ; \
+       done
+
 dep:
        for dir in $(SUBSUBDIRS) $(SUBDIRS); do \
-           ( cd $$dir; $(MAKE) dep ) ; \
+           ( cd $$dir; $(CC) -MM *.c > depend ) ; \
        done
        for dir in $(MAIN); do \
-           ( cd $$dir; $(MAKE) dep ) ; \
+           ( cd $$dir; $(CC) -MM *.c > depend ) ; \
        done
 
 clean:
@@ -134,6 +142,9 @@ tar: clean
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.11  1997/06/27 20:03:31  curt
+# Working on Makefile structure.
+#
 # Revision 1.10  1997/06/26 19:08:22  curt
 # Restructuring make, adding automatic "make dep" support.
 #

diff --git a/Slew/Makefile b/Slew/Makefile
index a14915c99586751fdbd93a7ec1bb34cd36163072..7f733647d7bf0c8b394bb43baf7dabbabf494370 100644 (file)
--- a/Slew/Makefile
+++ b/Slew/Makefile
@@ -48,8 +48,8 @@ $(TARGET): $(OFILES)
 
 all: $(TARGET)
 
-dep:                                 
-       $(CC) -MM *.c > depend                     
+# depend:
+#      $(CC) -MM *.c > depend                     
 
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
@@ -67,6 +67,9 @@ slew.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.5  1997/06/27 20:03:36  curt
+# Working on Makefile structure.
+#
 # Revision 1.4  1997/06/26 19:08:31  curt
 # Restructuring make, adding automatic "make dep" support.
 #

diff --git a/Time/Makefile b/Time/Makefile
index b04827ea40803714a06660f6a3987c11f5162d22..5685b61702b3228e6ead1f587d3b5ae7055b2603 100644 (file)
--- a/Time/Makefile
+++ b/Time/Makefile
@@ -49,8 +49,8 @@ $(TARGET): $(OFILES)
 
 all: $(TARGET)
 
-dep:                                 
-       $(CC) -MM *.c > depend                     
+# depend:
+#      $(CC) -MM *.c > depend                     
 
 clean:
        rm -f *.o $(TARGET) lib*.a *~ core
@@ -68,6 +68,9 @@ fg_timer.o:
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.5  1997/06/27 20:03:40  curt
+# Working on Makefile structure.
+#
 # Revision 1.4  1997/06/26 19:08:37  curt
 # Restructuring make, adding automatic "make dep" support.
 #