doughodson · jmc734 · Aug 28, 2015 · Aug 31, 2015 · Aug 31, 2015
diff --git a/Makefile b/Makefile
@@ -1,16 +1,11 @@
 
 # Libraries
-LIBS = src
+SUBDIRS = src
 
-all:
-	for subdir in $(LIBS); do \
-	  echo making $@ in $$subdir; \
-	  (cd $$subdir && $(MAKE)) || exit 1; \
-	done
+all: $(SUBDIRS)
 
-clean:
-	for subdir in $(LIBS); do \
-	    echo $@ in $$subdir; \
-	    (cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
+clean: $(SUBDIRS)
+
+$(SUBDIRS)::
+	$(MAKE) -C $@ $(MAKECMDGOALS)
 
diff --git a/src/Makefile b/src/Makefile
@@ -20,41 +20,38 @@ include makedefs
 # simulation   : -
 # terrain      : -
 #
-PROJECTS = basic
-PROJECTS += basicGL instruments
-PROJECTS += dafif
-PROJECTS += ioDevice
-PROJECTS += linearSys 
-PROJECTS += simulation sensors terrain
-PROJECTS += dis
-PROJECTS += dynamics
-PROJECTS += maps
-PROJECTS += recorder
+SUBDIRS = basic
+SUBDIRS += basicGL 
+SUBDIRS += instruments
+SUBDIRS += dafif
+SUBDIRS += ioDevice
+SUBDIRS += linearSys 
+SUBDIRS += simulation sensors terrain
+SUBDIRS += dis
+SUBDIRS += dynamics
+SUBDIRS += maps
+SUBDIRS += recorder
 
 #
 # GUI interface libraries
 #
-PROJECTS += "gui/glut"
+SUBDIRS += "gui/glut"
 
 # Out-the-Window interface classes to talk to visual systems
 # - CIGI Class Library 3.x interface
 # - download and install cigicl
-PROJECTS += otw
+SUBDIRS += otw
 
 #
 # HLA interface library
 #
-#PROJECTS += "hla"
+#SUBDIRS += "hla"
 
 #
 # Rules
 #
-all:
-	@echo ${OE_ROOT}
-	for subdir in $(PROJECTS); do \
-	  echo making $@ in $$subdir; \
-	  (cd $$subdir && $(MAKE)) || exit 1; \
-	done
+
+all: $(SUBDIRS)
 
 install: uninstall
 	-cp -r ../include/openeaagles /usr/local/include/openeaagles
@@ -64,10 +61,8 @@ uninstall:
 	-rm -rf /usr/local/include/openeaagles
 	-rm -rf /usr/local/lib/openeaagles
 
-clean:
+clean: $(SUBDIRS)
 	-rm -f *.o
-	for subdir in $(PROJECTS); do \
-	    echo $@ in $$subdir; \
-	    (cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
 
+$(SUBDIRS)::
+	$(MAKE) -C $@ $(MAKECMDGOALS)
diff --git a/src/basic/Makefile b/src/basic/Makefile
@@ -4,88 +4,79 @@ include ../makedefs
 LIB = $(OPENEAAGLES_LIB_DIR)/liboeBasic.a
 
 OBJS =  \
-	$(LIB)(support.o) \
-	$(LIB)(basicFF.o) \
-	$(LIB)(Boolean.o) \
-	$(LIB)(Cie.o) \
-	$(LIB)(Cmy.o) \
-	$(LIB)(Color.o) \
-	$(LIB)(Complex.o) \
-	$(LIB)(Component.o) \
-	$(LIB)(Decibel.o) \
-	$(LIB)(EarthModel.o) \
-	$(LIB)(Factory.o) \
-	$(LIB)(FileReader.o) \
-	$(LIB)(Float.o) \
-	$(LIB)(Function.o) \
-	$(LIB)(Functions.o) \
-	$(LIB)(Hls.o) \
-	$(LIB)(Hsva.o) \
-	$(LIB)(Hsv.o) \
-	$(LIB)(Identifier.o) \
-	$(LIB)(Integer.o) \
-	$(LIB)(IoAdapter.o) \
-	$(LIB)(IoData.o) \
-	$(LIB)(IoDevice.o) \
-	$(LIB)(IoHandler.o) \
-	$(LIB)(LatLon.o) \
-	$(LIB)(Lexical.o) \
-	$(LIB)(List.o) \
-	$(LIB)(Locus.o) \
-	$(LIB)(Logger.o) \
-	$(LIB)(Matrix.o) \
-	$(LIB)(Nav.o) \
-	$(LIB)(NavDR.o) \
-	$(LIB)(NetHandler.o) \
-	$(LIB)(Number.o) \
-	$(LIB)(Object.o) \
-	$(LIB)(Operators.o) \
-	$(LIB)(Pair.o) \
-	$(LIB)(PairStream.o) \
-	$(LIB)(Parser.o) \
-	$(LIB)(Rgba.o) \
-	$(LIB)(Rgb.o) \
-	$(LIB)(Rng.o) \
-	$(LIB)(SlotTable.o) \
-	$(LIB)(Stack.o) \
-	$(LIB)(Statistic.o) \
-	$(LIB)(StateMachine.o) \
-	$(LIB)(String.o) \
-	$(LIB)(Table.o) \
-	$(LIB)(Tables.o) \
-	$(LIB)(Terrain.o) \
-	$(LIB)(Thread.o) \
-	$(LIB)(ThreadPool.o) \
-	$(LIB)(Timers.o) \
-	$(LIB)(Transforms.o) \
-	$(LIB)(Vectors.o) \
-	$(LIB)(Yiq.o)
+	support.o \
+	basicFF.o \
+	Boolean.o \
+	Cie.o \
+	Cmy.o \
+	Color.o \
+	Complex.o \
+	Component.o \
+	Decibel.o \
+	EarthModel.o \
+	Factory.o \
+	FileReader.o \
+	Float.o \
+	Hls.o \
+	Hsva.o \
+	Hsv.o \
+	Identifier.o \
+	Integer.o \
+	IoAdapter.o \
+	IoData.o \
+	IoDevice.o \
+	IoHandler.o \
+	LatLon.o \
+	Lexical.o \
+	List.o \
+	Locus.o \
+	Logger.o \
+	Matrix.o \
+	Nav.o \
+	NavDR.o \
+	NetHandler.o \
+	Number.o \
+	Object.o \
+	Operators.o \
+	Pair.o \
+	PairStream.o \
+	Parser.o \
+	Rgba.o \
+	Rgb.o \
+	Rng.o \
+	SlotTable.o \
+	Stack.o \
+	Statistic.o \
+	StateMachine.o \
+	String.o \
+	Terrain.o \
+	Thread.o \
+	ThreadPool.o \
+	Timers.o \
+	Transforms.o \
+	Vectors.o \
+	Yiq.o
 
 SUBDIRS = distributions functors nethandlers osg ubf units util
 
-all: subdirs ${OBJS}
-
-subdirs:
+all:
+	$(MAKE) compile
+	$(MAKE) archive
+
+compile: $(SUBDIRS) ${OBJS}
+
+archive:
 	for subdir in $(SUBDIRS); do \
-	  echo making $@ in $$subdir; \
-	  (cd $$subdir && $(MAKE)) || exit 1; \
+		$(MAKE) -C $$subdir $(MAKECMDGOALS); \
 	done
+	ar rv $(LIB) ${OBJS}
 
-$(LIB)(Lexical.o): Lexical.cpp Parser.cpp Parser.hpp
-
-#Parser.cpp:  Parser.y
-#	dos2unix Parser.y
-#	bison -t Parser.y -o Parser.cpp
-
-#Lexical.cpp: Lexical.l
-#	dos2unix Lexical.l
-#	flex -f -oLexical.cpp Lexical.l
+Lexical.o: Lexical.cpp Parser.cpp Parser.hpp
 
-clean:
+clean: $(SUBDIRS)
 	-rm -f *.o
-	for subdir in $(SUBDIRS); do \
-	    echo making $@ in $$subdir; \
-	    (cd $$subdir && $(MAKE) $@) || exit 1; \
-	done
 	-rm -f $(LIB)
+
+$(SUBDIRS)::
+	$(MAKE) -C $@ $(MAKECMDGOALS)
 
diff --git a/src/basic/distributions/Makefile b/src/basic/distributions/Makefile
@@ -4,12 +4,19 @@ include ../../makedefs
 LIB = $(OPENEAAGLES_LIB_DIR)/liboeBasic.a
 
 OBJS =  \
-	$(LIB)(Exponential.o) \
-	$(LIB)(Lognormal.o) \
-	$(LIB)(Pareto.o) \
-	$(LIB)(Uniform.o)
+	Exponential.o \
+	Lognormal.o \
+	Pareto.o \
+	Uniform.o
 
-all: ${OBJS}
+all:
+	$(MAKE) compile
+	$(MAKE) archive
+
+compile: ${OBJS}
+
+archive:
+	ar rv $(LIB) ${OBJS}
 
 clean:
 	-rm -f *.o

diff --git a/src/basic/functors/Makefile b/src/basic/functors/Makefile
@@ -4,12 +4,19 @@ include ../../makedefs
 LIB = $(OPENEAAGLES_LIB_DIR)/liboeBasic.a
 
 OBJS =  \
-	$(LIB)(Function.o) \
-	$(LIB)(Functions.o) \
-	$(LIB)(Table.o) \
-	$(LIB)(Tables.o)
+	Function.o \
+	Functions.o \
+	Table.o \
+	Tables.o
 
-all: ${OBJS}
+all:
+	$(MAKE) compile
+	$(MAKE) archive
+
+compile: ${OBJS}
+
+archive:
+	ar rv $(LIB) ${OBJS}
 
 clean:
 	-rm -f *.o

diff --git a/src/basic/nethandlers/Makefile b/src/basic/nethandlers/Makefile
@@ -4,16 +4,23 @@ include ../../makedefs
 LIB = $(OPENEAAGLES_LIB_DIR)/liboeBasic.a
 
 OBJS =  \
-	$(LIB)(PosixHandler.o) \
-	$(LIB)(TcpClient.o) \
-	$(LIB)(TcpHandler.o) \
-	$(LIB)(TcpServerMultiple.o) \
-	$(LIB)(TcpServerSingle.o) \
-	$(LIB)(UdpBroadcastHandler.o) \
-	$(LIB)(UdpMulticastHandler.o) \
-	$(LIB)(UdpUnicastHandler.o)
+	PosixHandler.o \
+	TcpClient.o \
+	TcpHandler.o \
+	TcpServerMultiple.o \
+	TcpServerSingle.o \
+	UdpBroadcastHandler.o \
+	UdpMulticastHandler.o \
+	UdpUnicastHandler.o
 
-all: ${OBJS}
+all:
+	$(MAKE) compile
+	$(MAKE) archive
+
+compile: ${OBJS}
+
+archive:
+	ar rv $(LIB) ${OBJS}
 
 clean:
 	-rm -f *.o

diff --git a/src/basic/osg/Makefile b/src/basic/osg/Makefile
@@ -4,13 +4,20 @@ include ../../makedefs
 LIB = $(OPENEAAGLES_LIB_DIR)/liboeBasic.a
 
 OBJS =  \
-	$(LIB)(Math.o) \
-	$(LIB)(Matrixd.o) \
-	$(LIB)(MatrixDecomposition.o) \
-	$(LIB)(Matrixf.o) \
-	$(LIB)(Quat.o)
+	Math.o \
+	Matrixd.o \
+	MatrixDecomposition.o \
+	Matrixf.o \
+	Quat.o
 
-all: ${OBJS}
+all:
+	$(MAKE) compile
+	$(MAKE) archive
+
+compile: ${OBJS}
+
+archive:
+	ar rv $(LIB) ${OBJS}
 
 clean:
 	-rm -f *.o
diff --git a/src/basic/ubf/Makefile b/src/basic/ubf/Makefile
@@ -4,13 +4,20 @@ include ../../makedefs
 LIB = $(OPENEAAGLES_LIB_DIR)/liboeBasic.a
 
 OBJS =  \
-	$(LIB)(Action.o) \
-	$(LIB)(Agent.o) \
-	$(LIB)(Arbiter.o) \
-	$(LIB)(Behavior.o) \
-	$(LIB)(State.o)
+	Action.o \
+	Agent.o \
+	Arbiter.o \
+	Behavior.o \
+	State.o
 
-all: ${OBJS}
+all:
+	$(MAKE) compile
+	$(MAKE) archive
+
+compile: ${OBJS}
+
+archive:
+	ar rv $(LIB) ${OBJS}
 
 clean:
 	-rm -f *.o