Commit 4cf8bd2e authored by Jordan Sissel's avatar Jordan Sissel

Some cleanup

parent 6a49d11d
......@@ -7,6 +7,7 @@ CFLAGS+=-Wno-unused-function
LDFLAGS+=-pthread
LDFLAGS+=-Lbuild/lib -Wl,-rpath,'$$ORIGIN/../lib'
LIBS=-lzmq -ljemalloc -lssl -lcrypto -luuid -lz
#-llz4
FETCH=sh fetch.sh
......@@ -42,7 +43,7 @@ rpm deb:
#unixsock.c: build/include/insist.h
backoff.c: backoff.h
harvester.c: harvester.h proto.h str.h build/include/insist.h build/include/zmq.h
emitter.c: emitter.h ring.h build/include/zmq.h build/include/zlib.h
emitter.c: emitter.h ring.h build/include/zmq.h
lumberjack.c: build/include/insist.h build/include/zmq.h
lumberjack.c: backoff.h harvester.h emitter.h
harvester.c lumberjack.c pushpull.c ring.c str.c: build/include/jemalloc/jemalloc.h
......@@ -50,6 +51,8 @@ str.c: str.h
proto.c: proto.h str.h
ring.c: ring.h
proto.c: build/include/lz4.h
.PHONY: test
test: | build/test/test_ring
build/test/test_ring
......@@ -66,6 +69,7 @@ build/test/test_ring: test_ring.o ring.o | build/test
build/bin/lumberjack: | build/bin build/lib/libzmq.$(LIBEXT)
build/bin/lumberjack: | build/lib/libjemalloc.$(LIBEXT)
build/bin/lumberjack: | build/lib/libz.$(LIBEXT)
build/bin/lumberjack: | build/lib/liblz4.$(LIBEXT)
build/bin/lumberjack: lumberjack.o backoff.o harvester.o emitter.o str.o proto.o ring.o
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
@echo " => Build complete: $@"
......@@ -77,14 +81,14 @@ build/include/insist.h: | build/include
build/include/zmq.h build/lib/libzmq.$(LIBEXT): | build
PATH=$$PWD:$$PATH $(MAKE) -C vendor/zeromq/ install PREFIX=$$PWD/build
#build/include/msgpack.h build/lib/libmsgpack.$(LIBEXT): | build
# PATH=$$PWD:$$PATH $(MAKE) -C vendor/msgpack/ install PREFIX=$$PWD/build
build/include/msgpack.h build/lib/libmsgpack.$(LIBEXT): | build
PATH=$$PWD:$$PATH $(MAKE) -C vendor/msgpack/ install PREFIX=$$PWD/build
build/include/jemalloc/jemalloc.h build/lib/libjemalloc.$(LIBEXT): | build
PATH=$$PWD:$$PATH $(MAKE) -C vendor/jemalloc/ install PREFIX=$$PWD/build
#build/include/lz4.h build/lib/liblz4.$(LIBEXT): | build
# PATH=$$PWD:$$PATH $(MAKE) -C vendor/lz4/ install PREFIX=$$PWD/build
build/include/lz4.h build/lib/liblz4.$(LIBEXT): | build
PATH=$$PWD:$$PATH $(MAKE) -C vendor/lz4/ install PREFIX=$$PWD/build
build/include/zlib.h build/lib/libz.$(LIBEXT): | build
PATH=$$PWD:$$PATH $(MAKE) -C vendor/zlib/ install PREFIX=$$PWD/build
......
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