Commit b1d639ec authored by Axel Auweter's avatar Axel Auweter
Browse files

CollectAgent not yet ready for parallel build -> all projects are built sequentially.

Cassandra Header Fixes are applied only once now.
parent c49932b4
......@@ -8,6 +8,8 @@ TARGET = CollectAgent
SUBTARGETS = cassandra-lib
.PHONY : check-thrift-env cassandra-lib clean clean-cassandra-headers install
P = $(shell cd $(DCDBDEPLOYPATH)/lib/ && pwd)
U = $(shell uname)
......@@ -34,8 +36,10 @@ check-thrift-env:
cassandra-lib: cassandra
@if [ "$U" = "Linux" ]; then \
echo "Fixing Thrift includes... "; \
sed -i '1i#include <stdint.h>' cassandra/cassandra_types.h; \
sed -i '1i#include <stdint.h>' cassandra/Cassandra.h; \
grep stdint cassandra/cassandra_types.h > /dev/null; \
if [ "$$?" -eq "1" ]; then sed -i '1i#include <stdint.h>' cassandra/cassandra_types.h; fi;\
grep stdint cassandra/Cassandra.h > /dev/null; \
if [ "$$?" -eq "1" ]; then sed -i '1i#include <stdint.h>' cassandra/Cassandra.h; fi;\
fi
cassandra:
......
......@@ -53,7 +53,7 @@ distclean:
@rm -rf $(DCDBBUILDPATH)
all: $(DCDBBUILDPATH)/.prerequesites
make -j $(MAKETHREADS) $(PROJECTS)
make $(PROJECTS)
$(DCDBBUILDPATH)/.prerequesites: $(DCDBBUILDPATH)/.extract-distfiles
@echo ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment