From 127b957f22ee1233ecda30410d8c904a69ee7715 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 27 Jun 1997 21:37:59 +0000 Subject: [PATCH] Working on Makefile structure. --- Aircraft/Makefile | 17 +++----- Aircraft/depend | 4 ++ Controls/Makefile | 17 +++----- Controls/depend | 5 +++ FDM/Makefile | 19 +++------ FDM/depend | 2 + LaRCsim/Makefile | 15 +++---- LaRCsim/depend | 25 +++++++++++ Main/Makefile | 48 +++++---------------- Main/depend | 21 +++++++++ Scenery/Makefile | 15 +++---- Scenery/depend | 3 ++ Simulator/Makefile | 72 ++----------------------------- Simulator/make.inc | 104 +++++++++++++++++++++++++++++++++++++++++++++ Slew/Makefile | 17 +++----- Slew/depend | 5 +++ Time/Makefile | 17 +++----- Time/depend | 1 + 18 files changed, 233 insertions(+), 174 deletions(-) create mode 100644 Aircraft/depend create mode 100644 Controls/depend create mode 100644 FDM/depend create mode 100644 LaRCsim/depend create mode 100644 Main/depend create mode 100644 Scenery/depend create mode 100644 Simulator/make.inc create mode 100644 Slew/depend create mode 100644 Time/depend diff --git a/Aircraft/Makefile b/Aircraft/Makefile index afc9813c5..7c20d0d97 100644 --- a/Aircraft/Makefile +++ b/Aircraft/Makefile @@ -30,15 +30,12 @@ CFILES = aircraft.c HFILES = aircraft.h OFILES = $(CFILES:.c=.o) -CC = gcc + +include ../make.inc + + CFLAGS = $(FG_CFLAGS) -AR = ar - -INCLUDES = - -LIBS = - #--------------------------------------------------------------------------- # Primary Targets @@ -49,9 +46,6 @@ $(TARGET): $(OFILES) $(HFILES) all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - clean: rm -f *.o $(TARGET) lib*.a *~ core @@ -68,6 +62,9 @@ aircraft.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.7 1997/06/27 21:38:02 curt +# Working on Makefile structure. +# # Revision 1.6 1997/06/27 20:03:32 curt # Working on Makefile structure. # diff --git a/Aircraft/depend b/Aircraft/depend new file mode 100644 index 000000000..fc10b018c --- /dev/null +++ b/Aircraft/depend @@ -0,0 +1,4 @@ +aircraft.o: aircraft.c aircraft.h ../Flight/flight.h \ + ../Flight/Slew/slew.h ../Flight/LaRCsim/ls_interface.h \ + ../Flight/LaRCsim/../flight.h ../Controls/controls.h \ + ../Controls/../limits.h diff --git a/Controls/Makefile b/Controls/Makefile index be9472607..e738f402d 100644 --- a/Controls/Makefile +++ b/Controls/Makefile @@ -30,15 +30,12 @@ CFILES = controls.c HFILES = controls.h OFILES = $(CFILES:.c=.o) -CC = gcc + +include ../make.inc + + CFLAGS = $(FG_CFLAGS) -AR = ar - -INCLUDES = - -LIBS = - #--------------------------------------------------------------------------- # Primary Targets @@ -49,9 +46,6 @@ $(TARGET): $(OFILES) all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - clean: rm -f *.o $(TARGET) lib*.a *~ core @@ -68,6 +62,9 @@ controls.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.8 1997/06/27 21:38:03 curt +# Working on Makefile structure. +# # Revision 1.7 1997/06/27 20:03:33 curt # Working on Makefile structure. # diff --git a/Controls/depend b/Controls/depend new file mode 100644 index 000000000..b3cba7d64 --- /dev/null +++ b/Controls/depend @@ -0,0 +1,5 @@ +controls.o: controls.c controls.h ../limits.h ../Aircraft/aircraft.h \ + ../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \ + ../Aircraft/../Flight/LaRCsim/ls_interface.h \ + ../Aircraft/../Flight/LaRCsim/../flight.h \ + ../Aircraft/../Controls/controls.h diff --git a/FDM/Makefile b/FDM/Makefile index 7cf767656..1a3a9b664 100644 --- a/FDM/Makefile +++ b/FDM/Makefile @@ -29,15 +29,12 @@ TARGET=libFlight.a CFILES = flight.c OFILES = $(CFILES:.c=.o) -CC = gcc + +include ../make.inc + + CFLAGS = $(FG_CFLAGS) -AR = ar - -INCLUDES = - -LIBS = - #--------------------------------------------------------------------------- # Primary Targets @@ -48,11 +45,6 @@ $(TARGET): $(OFILES) all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - -dep: depend - clean: rm -f *.o $(TARGET) lib*.a *~ core @@ -69,6 +61,9 @@ flight.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.8 1997/06/27 21:38:05 curt +# Working on Makefile structure. +# # Revision 1.7 1997/06/27 20:03:34 curt # Working on Makefile structure. # diff --git a/FDM/depend b/FDM/depend new file mode 100644 index 000000000..8ce307456 --- /dev/null +++ b/FDM/depend @@ -0,0 +1,2 @@ +flight.o: flight.c flight.h Slew/slew.h LaRCsim/ls_interface.h \ + LaRCsim/../flight.h diff --git a/LaRCsim/Makefile b/LaRCsim/Makefile index bad4f7662..a195d5189 100644 --- a/LaRCsim/Makefile +++ b/LaRCsim/Makefile @@ -21,13 +21,12 @@ CFILES = $(LaRCsimFILES) $(NavionFILES) $(InterfaceFILES) OFILES = $(CFILES:.c=.o) -CC = gcc + +include ../../make.inc + + CFLAGS = $(FG_CFLAGS) -AR = ar - -INCLUDES = - LIBS = -lm @@ -43,9 +42,6 @@ simtest: $(TARGET) LaRCsim.o all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - clean: rm -f *.o $(TARGET) *~ core @@ -59,6 +55,9 @@ include depend #--------------------------------------------------------------------------- # $Log$ +# Revision 1.6 1997/06/27 21:38:06 curt +# Working on Makefile structure. +# # Revision 1.5 1997/06/27 20:03:34 curt # Working on Makefile structure. # diff --git a/LaRCsim/depend b/LaRCsim/depend new file mode 100644 index 000000000..6a3fc39dc --- /dev/null +++ b/LaRCsim/depend @@ -0,0 +1,25 @@ +LaRCsim.o: LaRCsim.c ls_types.h ls_constants.h ls_generic.h \ + ls_sim_control.h ls_cockpit.h +atmos_62.o: atmos_62.c ls_types.h ls_constants.h +default_model_routines.o: default_model_routines.c +ls_accel.o: ls_accel.c ls_types.h ls_generic.h ls_constants.h +ls_aux.o: ls_aux.c ls_types.h ls_constants.h ls_generic.h +ls_geodesy.o: ls_geodesy.c ls_types.h ls_constants.h +ls_gravity.o: ls_gravity.c ls_types.h ls_constants.h +ls_init.o: ls_init.c ls_types.h ls_sym.h ls_generic.h +ls_interface.o: ls_interface.c ls_types.h ls_constants.h ls_generic.h \ + ls_sim_control.h ls_cockpit.h ls_interface.h ../flight.h \ + ../Slew/slew.h ../LaRCsim/ls_interface.h ../../Aircraft/aircraft.h \ + ../../Aircraft/../Flight/flight.h \ + ../../Aircraft/../Controls/controls.h \ + ../../Aircraft/../Controls/../limits.h +ls_model.o: ls_model.c ls_types.h +ls_step.o: ls_step.c ls_types.h ls_constants.h ls_generic.h +ls_sync.o: ls_sync.c ls_types.h ls_sim_control.h +mymain.o: mymain.c ls_types.h ls_cockpit.h ls_generic.h +navion_aero.o: navion_aero.c ls_types.h ls_generic.h ls_cockpit.h +navion_engine.o: navion_engine.c ls_types.h ls_constants.h \ + ls_generic.h ls_cockpit.h ls_sim_control.h +navion_gear.o: navion_gear.c ls_types.h ls_constants.h ls_generic.h \ + ls_cockpit.h +navion_init.o: navion_init.c ls_types.h ls_generic.h ls_cockpit.h diff --git a/Main/Makefile b/Main/Makefile index bd93c679a..08f2d0272 100644 --- a/Main/Makefile +++ b/Main/Makefile @@ -26,41 +26,6 @@ TARGET=fgfs0 -CC = gcc - - -#--------------------------------------------------------------------------- -# This is overridden in the top level Makefile, if make is run from there. -#--------------------------------------------------------------------------- - -# For GLUT -INTERFACE_FLAGS = -DGLUT -INTERFACE_LIBS = -lglut -INTERFACE_FILES = GLUTkey.c - -# For MESA_TK (Tk interface to Mesa) -# INCLUDES = -I/usr/include/mesa -# INTERFACE_FLAGS = -DMESA_TK -# INTERFACE_LIBS = -L/usr/lib/mesa -lMesatk -# INTERFACE_FILES = GLTKkey.c - - -#--------------------------------------------------------------------------- -# Define main GL libraries -#--------------------------------------------------------------------------- - -# For OpenGL -# GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11 - -# For Mesa -MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL -X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) - - -CFLAGS = $(FG_CFLAGS) $(INTERFACE_FLAGS) -LIBS = $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl - CFILES = GLmain.c $(INTERFACE_FILES) mesh2GL.c OFILES = $(CFILES:.c=.o) AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \ @@ -70,6 +35,13 @@ AFILES = ../Aircraft/libAircraft.a ../Controls/libControls.a \ ../Timer/libTimer.a +include ../make.inc + + +CFLAGS = $(FG_CFLAGS) $(INTERFACE_FLAGS) +LIBS = $(INTERFACE_LIBS) $(GRAPHICS_LIBS) -lm -lfl + + #--------------------------------------------------------------------------- # Primary Targets #--------------------------------------------------------------------------- @@ -79,9 +51,6 @@ $(TARGET): $(OFILES) $(AFILES) all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - clean: rm -f *.o $(TARGET) lib*.a *~ core @@ -107,6 +76,9 @@ mesh2GL.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.19 1997/06/27 21:38:09 curt +# Working on Makefile structure. +# # Revision 1.18 1997/06/27 20:03:36 curt # Working on Makefile structure. # diff --git a/Main/depend b/Main/depend new file mode 100644 index 000000000..ad4494171 --- /dev/null +++ b/Main/depend @@ -0,0 +1,21 @@ +GLTKkey.o: GLTKkey.c /usr/include/gltk.h GLTKkey.h \ + ../Aircraft/aircraft.h ../Aircraft/../Flight/flight.h \ + ../Aircraft/../Flight/Slew/slew.h \ + ../Aircraft/../Flight/LaRCsim/ls_interface.h \ + ../Aircraft/../Flight/LaRCsim/../flight.h \ + ../Aircraft/../Controls/controls.h \ + ../Aircraft/../Controls/../limits.h +GLUTkey.o: GLUTkey.c GLUTkey.h ../Aircraft/aircraft.h \ + ../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \ + ../Aircraft/../Flight/LaRCsim/ls_interface.h \ + ../Aircraft/../Flight/LaRCsim/../flight.h \ + ../Aircraft/../Controls/controls.h \ + ../Aircraft/../Controls/../limits.h +GLmain.o: GLmain.c ../Aircraft/aircraft.h \ + ../Aircraft/../Flight/flight.h ../Aircraft/../Flight/Slew/slew.h \ + ../Aircraft/../Flight/LaRCsim/ls_interface.h \ + ../Aircraft/../Flight/LaRCsim/../flight.h \ + ../Aircraft/../Controls/controls.h \ + ../Aircraft/../Controls/../limits.h ../Scenery/scenery.h \ + ../mat3/mat3.h ../Timer/fg_timer.h +mesh2GL.o: mesh2GL.c ../Scenery/mesh.h ../mat3/mat3.h diff --git a/Scenery/Makefile b/Scenery/Makefile index ec441d6ec..aa230a809 100644 --- a/Scenery/Makefile +++ b/Scenery/Makefile @@ -30,13 +30,12 @@ CFILES = common.c mesh.c scenery.c HFILES = OFILES = $(CFILES:.c=.o) -CC = gcc + +include ../make.inc + + CFLAGS = $(FG_CFLAGS) -AR = ar - -INCLUDES = - #--------------------------------------------------------------------------- # Primary Targets @@ -47,9 +46,6 @@ $(TARGET): $(OFILES) $(HFILES) all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - clean: rm -f *.o $(TARGET) lib*.a *~ core @@ -72,6 +68,9 @@ scenery.o: #--------------------------------------------------------------------------- # $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. # diff --git a/Scenery/depend b/Scenery/depend new file mode 100644 index 000000000..45d2bf0c4 --- /dev/null +++ b/Scenery/depend @@ -0,0 +1,3 @@ +common.o: common.c common.h +mesh.o: mesh.c mesh.h common.h +scenery.o: scenery.c scenery.h ParseVRML/parsevrml.h diff --git a/Simulator/Makefile b/Simulator/Makefile index d59dddae5..e022b30d9 100644 --- a/Simulator/Makefile +++ b/Simulator/Makefile @@ -24,74 +24,7 @@ #--------------------------------------------------------------------------- -#--------------------------------------------------------------------------- -# Choose your weapon -#--------------------------------------------------------------------------- - -CC = gcc -export CC - - -#--------------------------------------------------------------------------- -# Global Compile Options -# -# You may set FG_CFLAGS to include any of the following options depending on -# your environment: -# -# -g - Compile with debugging symbols -# -# -Wall - Enable full compiler warnings -# -# -O2 - Enable compiler optimization -# -# -DUSE_ITIMER - Use setitimer(), getitimer(), and signal() to mimic -# a real time system and call the flight model routines -# at a regular interval, rather than between screen updates -# which can be highly variable. This can make the flight -# much smoother. -#--------------------------------------------------------------------------- - -FG_CFLAGS = -g -Wall -DUSE_ITIMER -export FG_CFLAGS - - -#--------------------------------------------------------------------------- -# Uncomment one of the following sections depending on your system -# -# You may set FG_GRAPHICS to include any of the following options depending -# on your environment: -#--------------------------------------------------------------------------- - -#--------------------------------------------------------------------------- -# SGI IRIX with the GLUT toolkit -# -# INTERFACE_FLAGS = -DGLUT -# INTERFACE_LIBS = -lglut -# INTERFACE_FILES = GLUTkey.c -# GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11 -#--------------------------------------------------------------------------- - -#--------------------------------------------------------------------------- -# Linux/Mesa with the GLUT toolkit -# -INTERFACE_FLAGS = -DGLUT -INTERFACE_LIBS = -lglut -INTERFACE_FILES = GLUTkey.c -MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL -X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) -#--------------------------------------------------------------------------- - -#--------------------------------------------------------------------------- -# Windows 95/NT with the GLUT toolkit -# -# INTERFACE_FLAGS = -DGLUT -# INTERFACE_LIBS = -lglut -# INTERFACE_FILES = GLUTkey.c -# GRAPHICS_LIBS = -lGLU -lGL -#--------------------------------------------------------------------------- - -export INTERFACE_FLAGS INTERFACE_LIBS GRAPHICS_LIBS +include make.inc #--------------------------------------------------------------------------- @@ -142,6 +75,9 @@ tar: clean #--------------------------------------------------------------------------- # $Log$ +# Revision 1.12 1997/06/27 21:37:59 curt +# Working on Makefile structure. +# # Revision 1.11 1997/06/27 20:03:31 curt # Working on Makefile structure. # diff --git a/Simulator/make.inc b/Simulator/make.inc new file mode 100644 index 000000000..5f63c703e --- /dev/null +++ b/Simulator/make.inc @@ -0,0 +1,104 @@ +# Hey Emacs, this is a Makefile. -*- Mode: Makefile -*- +# +# Common Makefile section +# +# Written by Curtis Olson, started May 1997. +# +# Copyright (C) 1997 Curtis L. Olson - curt@infoplane.com +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# $Id$ +# (Log is kept at end of this file) +#--------------------------------------------------------------------------- + + +#--------------------------------------------------------------------------- +# Choose your weapons +#--------------------------------------------------------------------------- + +CC = gcc + +FLEX = flex -f -L + +BISON = bison -v --no-lines + +AR = ar + + +#--------------------------------------------------------------------------- +# Global Compile Options +# +# You may set FG_CFLAGS to include any of the following options depending on +# your environment: +# +# -g - Compile with debugging symbols +# +# -Wall - Enable full compiler warnings +# +# -O2 - Enable compiler optimization +# +# -DUSE_ITIMER - Use setitimer(), getitimer(), and signal() to mimic +# a real time system and call the flight model routines +# at a regular interval, rather than between screen updates +# which can be highly variable. This can make the flight +# much smoother. +#--------------------------------------------------------------------------- + +FG_CFLAGS = -g -Wall -DUSE_ITIMER + + +#--------------------------------------------------------------------------- +# Uncomment one of the following sections depending on your system +# +# You may set FG_GRAPHICS to include any of the following options depending +# on your environment: +#--------------------------------------------------------------------------- + +#--------------------------------------------------------------------------- +# SGI IRIX with the GLUT toolkit +# +# INTERFACE_FLAGS = -DGLUT +# INTERFACE_LIBS = -lglut +# INTERFACE_FILES = GLUTkey.c +# GRAPHICS_LIBS = -lGLU -lGL -lXmu -lX11 +#--------------------------------------------------------------------------- + +#--------------------------------------------------------------------------- +# Linux/Mesa with the GLUT toolkit +# +INTERFACE_FLAGS = -DGLUT +INTERFACE_LIBS = -lglut +INTERFACE_FILES = GLUTkey.c +MESA_LIBS = -L/usr/lib/mesa -lMesatk -lMesaaux -lMesaGLU -lMesaGL +X11_LIBS = -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 +GRAPHICS_LIBS = $(MESA_LIBS) $(X11_LIBS) +#--------------------------------------------------------------------------- + +#--------------------------------------------------------------------------- +# Windows 95/NT with the GLUT toolkit +# +# INTERFACE_FLAGS = -DGLUT +# INTERFACE_LIBS = -lglut +# INTERFACE_FILES = GLUTkey.c +# GRAPHICS_LIBS = -lGLU -lGL +#--------------------------------------------------------------------------- + + +#--------------------------------------------------------------------------- +# $Log$ +# Revision 1.1 1997/06/27 21:38:00 curt +# Working on Makefile structure. +# diff --git a/Slew/Makefile b/Slew/Makefile index 7f733647d..1448adbb0 100644 --- a/Slew/Makefile +++ b/Slew/Makefile @@ -29,15 +29,12 @@ TARGET=libSlew.a CFILES = slew.c OFILES = $(CFILES:.c=.o) -CC = gcc + +include ../../make.inc + + CFLAGS = $(FG_CFLAGS) -AR = ar - -INCLUDES = - -LIBS = - #--------------------------------------------------------------------------- # Primary Targets @@ -48,9 +45,6 @@ $(TARGET): $(OFILES) all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - clean: rm -f *.o $(TARGET) lib*.a *~ core @@ -67,6 +61,9 @@ slew.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.6 1997/06/27 21:38:07 curt +# Working on Makefile structure. +# # Revision 1.5 1997/06/27 20:03:36 curt # Working on Makefile structure. # diff --git a/Slew/depend b/Slew/depend new file mode 100644 index 000000000..9df003d84 --- /dev/null +++ b/Slew/depend @@ -0,0 +1,5 @@ +slew.o: slew.c slew.h ../flight.h ../Slew/slew.h \ + ../LaRCsim/ls_interface.h ../LaRCsim/../flight.h \ + ../../Aircraft/aircraft.h ../../Aircraft/../Flight/flight.h \ + ../../Aircraft/../Controls/controls.h \ + ../../Aircraft/../Controls/../limits.h ../../Controls/controls.h diff --git a/Time/Makefile b/Time/Makefile index 5685b6170..eb697eb8d 100644 --- a/Time/Makefile +++ b/Time/Makefile @@ -30,15 +30,12 @@ CFILES = fg_timer.c HFILES = fg_timer.h OFILES = $(CFILES:.c=.o) -CC = gcc + +include ../make.inc + + CFLAGS = $(FG_CFLAGS) -AR = ar - -INCLUDES = - -LIBS = - #--------------------------------------------------------------------------- # Primary Targets @@ -49,9 +46,6 @@ $(TARGET): $(OFILES) all: $(TARGET) -# depend: -# $(CC) -MM *.c > depend - clean: rm -f *.o $(TARGET) lib*.a *~ core @@ -68,6 +62,9 @@ fg_timer.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.6 1997/06/27 21:38:13 curt +# Working on Makefile structure. +# # Revision 1.5 1997/06/27 20:03:40 curt # Working on Makefile structure. # diff --git a/Time/depend b/Time/depend new file mode 100644 index 000000000..69e2cee1a --- /dev/null +++ b/Time/depend @@ -0,0 +1 @@ +fg_timer.o: fg_timer.c fg_timer.h