From 134d37d4498b7ef7b6953662c4a89ec5009ff32a Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 27 Jun 1997 20:03:31 +0000 Subject: [PATCH] Working on Makefile structure. --- Aircraft/Makefile | 7 +++++-- Controls/Makefile | 7 +++++-- FDM/Makefile | 9 +++++++-- LaRCsim/Makefile | 7 +++++-- Main/Makefile | 7 +++++-- Scenery/Makefile | 7 +++++-- Scenery/scenery.c | 9 ++++++--- Simulator/Makefile | 19 +++++++++++++++---- Slew/Makefile | 7 +++++-- Time/Makefile | 7 +++++-- 10 files changed, 63 insertions(+), 23 deletions(-) diff --git a/Aircraft/Makefile b/Aircraft/Makefile index e554c8618..afc9813c5 100644 --- 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 7315b7ade..be9472607 100644 --- 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 0082de4e8..7cf767656 100644 --- 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 d8c527375..bad4f7662 100644 --- 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 2abde6fc1..bd93c679a 100644 --- 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 65625edf6..ec441d6ec 100644 --- 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 9a234fb61..96c58ec06 100644 --- 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 eaf1bc3d6..d59dddae5 100644 --- 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 -dep: +depend: for dir in $(SUBSUBDIRS) $(SUBDIRS); do \ - ( cd $$dir; $(MAKE) dep ) ; \ + ( cd $$dir; $(MAKE) depend ) ; \ done for dir in $(MAIN); do \ - ( cd $$dir; $(MAKE) dep ) ; \ + ( cd $$dir; $(MAKE) depend ) ; \ + done + +dep: + for dir in $(SUBSUBDIRS) $(SUBDIRS); do \ + ( cd $$dir; $(CC) -MM *.c > depend ) ; \ + done + for dir in $(MAIN); do \ + ( 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 a14915c99..7f733647d 100644 --- 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 b04827ea4..5685b6170 100644 --- 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. #