From 1c60104d00258013448017493a0f69547afa5491 Mon Sep 17 00:00:00 2001 From: Jeff Abrahamson Date: Sun, 3 May 2015 20:47:08 +0200 Subject: [PATCH] Remove Boost serialization dependency. Fix dependency order so that protobufs are compiled before files that need them. Part of #54. --- src/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 73ee65f..7fc34c5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,7 +28,6 @@ OBJECT = $(SRC:%.cpp=%.o) LIBS = \ -lboost_program_options \ - -lboost_serialization \ -lbz2 \ -lcrypto++ \ -lprotobuf \ @@ -44,7 +43,7 @@ all : srd test TAGS %.pb.h %.pb.cc : %.proto protoc --cpp_out=. $< -srd : main.o $(HEADER) $(OBJECT) Makefile +srd : $(HEADER) main.o $(OBJECT) Makefile $(CC) -o srd main.o $(OBJECT) $(LIBS) ############################################################ @@ -94,7 +93,7 @@ test : $(TESTS) -./$@ clean : clean-test - rm -f $(OBJECT) *.o *~ srd TAGS *_test + rm -f $(OBJECT) *.o *~ srd TAGS *_test $(PROTOBUF_C) $(PROTOBUF_H) clean-test : rm -rf srd-test-*/ test_[0-9]*\.[0-9]*