OK, blonde moment. -- Ross
On Wed, 2001-11-28 at 21:09, Ross Golder wrote: > On Mon, 2001-11-26 at 17:51, Ross Golder wrote: > > I'm just making sure the Makefile.linux system works, then I'll get back > > onto the GNU auto* stuff, as long as everyone's happy that it'll be > > wanted. > > > > OK. Started with a fresh JSBSim checkout. The Makefile.linux is pretty > out-of-date, and basically, broken. The attached patch gets things > moving a bit further, but basically, I don't think this system is > anywhere near as flexible as automake, so I'll be concentrating on that > from now on. > > However, this patch out to be committed, as it still represents a step > forward. Perhaps, Jon, you could grant user 'rossigee' commit access > which would speed things up a bit, and make me feel less like my > contributions are just being ignored (my improved cp2fg script still > hasn't made it into CVS yet!!!). > > Thanks, > > -- > Ross > > > > _______________________________________________ > Flightgear-devel mailing list > [EMAIL PROTECTED] > http://mail.flightgear.org/mailman/listinfo/flightgear-devel
Index: Makefile.linux =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/Makefile.linux,v retrieving revision 1.1 diff -u -r1.1 Makefile.linux --- Makefile.linux 2000/05/04 11:36:19 1.1 +++ Makefile.linux 2001/11/28 21:18:16 @@ -1,59 +1,39 @@ INCLUDES = -I. -LINKDIR= -Lfiltersjb +LINKDIR = -Lfiltersjb +CCOPTS = -Wall +CC = g++ + +JSBSim_objects = \ + FGAircraft.o \ + FGAtmosphere.o \ + FGCoefficient.o \ + FGFCS.o \ + FGFDMExec.o \ + FGModel.o \ + FGOutput.o \ + FGPosition.o \ + FGRotation.o \ + FGState.o \ + FGTranslation.o \ + FGUtility.o \ + FGEngine.o \ + FGTank.o \ + FGAuxiliary.o \ + FGfdmSocket.o \ + FGConfigFile.o \ + FGInitialCondition.o \ + FGLGear.o \ + FGMatrix33.o -JSBSim_objects = FGAircraft.o FGAtmosphere.o FGCoefficient.o FGFCS.o FGFDMExec.o\ - FGModel.o FGOutput.o FGPosition.o FGRotation.o FGState.o FGTranslation.o\ - FGUtility.o FGEngine.o FGTank.o FGAuxiliary.o FGfdmSocket.o\ - FGConfigFile.o FGInitialCondition.o FGLGear.o FGMatrix.o FGTrimLong.o - JSBSim : $(JSBSim_objects) JSBSim.o cd filtersjb && make && cd .. - g++ $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) JSBSim.o -oJSBSim -lm -lFCSComponents -FGAircraft.o : FGAircraft.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGAircraft.cpp -FGAtmosphere.o : FGAtmosphere.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGAtmosphere.cpp -FGAuxiliary.o : FGAuxiliary.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGAuxiliary.cpp -FGCoefficient.o : FGCoefficient.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGCoefficient.cpp -FGFCS.o : FGFCS.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGFCS.cpp -FGFDMExec.o : FGFDMExec.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGFDMExec.cpp -FGModel.o : FGModel.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGModel.cpp -FGOutput.o : FGOutput.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGOutput.cpp -FGPosition.o : FGPosition.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGPosition.cpp -FGRotation.o : FGRotation.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGRotation.cpp -FGState.o : FGState.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGState.cpp -FGTranslation.o : FGTranslation.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGTranslation.cpp -FGUtility.o : FGUtility.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGUtility.cpp -FGEngine.o : FGEngine.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGEngine.cpp -FGTank.o : FGTank.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGTank.cpp -FGInitialCondition.o : FGInitialCondition.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGInitialCondition.cpp -FGfdmSocket.o : FGfdmSocket.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGfdmSocket.cpp -FGConfigFile.o : FGConfigFile.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGConfigFile.cpp -FGLGear.o : FGLGear.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGLGear.cpp -FGMatrix.o : FGMatrix.cpp - g++ $(INCLUDES) $(CCOPTS) -c FGMatrix.cpp -FGTrimLong.o: FGTrimLong.cpp FGTrimLong.h - g++ $(INCLUDES) $(CCOPTS) -c FGTrimLong.cpp -JSBSim.o : JSBSim.cpp - g++ $(INCLUDES) $(CCOPTS) -c JSBSim.cpp + $(CC) $(INCLUDES) $(CCOPTS) $(LINKDIR) $(JSBSim_objects) JSBSim.o -oJSBSim -lm -lFCSComponents +$(JSBSim_objects) : %.o : %.cpp + $(CC) $(INCLUDES) $(CCOPTS) -c $< -o $@ + +JSBSim.o : JSBSim.cpp + $(CC) $(INCLUDES) $(CCOPTS) -c JSBSim.cpp clean: mv *.*~ backup @@ -62,15 +42,3 @@ all: touch *.cpp make JSBSim - -debug: - env CCOPTS=-g -WALL - make all - - - - - - - -
