Enable parallel builds for CollectAgent

CollectAgent/Makefile

@@ -3,17 +3,20 @@ DCDBDEPLOYPATH ?= $(DCDBBUILDPATH)/deploy/
 
 CXXFLAGS =	-O0 -g -Wall -fmessage-length=0 -I$(DCDBDEPLOYPATH)/include/
 OBJS =		collectagent.o cassandra/Cassandra.o cassandra/cassandra_constants.o cassandra/cassandra_types.o
+SRC = 		$(patsubst cassandra/%,,$(OBJS:.o=.cpp))
 LIBS =		-L$(DCDBDEPLOYPATH)/lib/ -lthrift -lmosquitto -lssl -lcrypto -lpthread
 TARGET =	collectagent
 
-SUBTARGETS = cassandra-lib
+SUBTARGETS = cassandra/Cassandra.h
 
-.PHONY : check-thrift-env cassandra-lib clean clean-cassandra-headers install
+.PHONY : check-thrift-env clean clean-cassandra-headers install
 
 P =		$(shell cd $(DCDBDEPLOYPATH)/lib/ && pwd)
 U =		$(shell uname)
 
-$(TARGET):	$(SUBTARGETS) $(OBJS) 
+$(TARGET): $(SRC)
+	$(MAKE) cassandra/Cassandra.h
+	$(MAKE) $(OBJS)
 	$(CXX) -o $(TARGET) $(OBJS) $(LIBS)
 
 all:	$(TARGET)
@@ -22,18 +25,23 @@ check-thrift-env:
 	@if [ "$U" = "Darwin" ]; then \
 	R=`echo $$DYLD_LIBRARY_PATH | grep $P`; \
 	if [ "$$R" = "" ]; then \
-	echo "******************************************\nPlease type the following line before running:\n  export DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:$P\n******************************************"; \
+	echo "\n******************************************\nPlease type the following line before running:\n  export DYLD_LIBRARY_PATH=$$DYLD_LIBRARY_PATH:$P\n******************************************\n"; \
 	fi; \
 	fi
 	@if [ "$U" = "Linux" ]; then \
 	R=`echo $$LD_LIBRARY_PATH | grep $P`; \
 	if [ "$$R" = "" ]; then \
-	echo "******************************************\nPlease type the following line before running:\n  export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$P\n******************************************"; \
+	echo "\n******************************************\nPlease type the following line before running:\n  export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$P\n******************************************\n"; \
 	fi; \
 	fi
 
-
-cassandra-lib: cassandra
+cassandra/Cassandra.h:
+	@if [ ! -e cassandra ]; then \
+	printf "Building Thrift interface headers... "; \
+	$(DCDBDEPLOYPATH)/bin/thrift --gen cpp $(DCDBBUILDPATH)/apache-cassandra-1.2.3/interface/cassandra.thrift; \
+	mv gen-cpp cassandra; \
+	echo "Done."; \
+	fi
 	@if [ "$U" = "Linux" ]; then \
 	echo "Fixing Thrift includes... "; \
 	grep stdint cassandra/cassandra_types.h > /dev/null; \
@@ -42,14 +50,6 @@ cassandra-lib: cassandra
 	if [ "$$?" -eq "1" ]; then sed -i '1i#include <stdint.h>' cassandra/Cassandra.h; fi;\
 	fi
 
-cassandra:
-	@if [ ! -e cassandra ]; then \
-	printf "Building Thrift interface headers... "; \
-	$(DCDBDEPLOYPATH)/bin/thrift --gen cpp $(DCDBBUILDPATH)/apache-cassandra-1.2.3/interface/cassandra.thrift; \
-	mv gen-cpp cassandra; \
-	echo "Done."; \
-	fi
-
 clean: clean-cassandra-headers
 	rm -f $(OBJS) $(TARGET)