From b09e6d21c1db08a182730a01ebc564e846ec384b Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Sat, 1 Oct 2011 07:06:02 -0500 Subject: [PATCH] fixes makefile so dynamic library building works again. Static library build of applications should require fewer libraries now as well --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f943894bf1..127ca3abf6 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,8 @@ objects = websocket_server_session.o websocket_client_session.o websocket_session.o websocket_server.o websocket_client.o websocket_frame.o \ network_utilities.o sha1.o base64.o +libs = -lboost_system -lboost_date_time -lboost_regex + OS=$(shell uname) # Defaults @@ -116,9 +118,9 @@ $(lib_target): banner installdirs $(addprefix $(objdir)/, $(objects)) @echo "Link " cd $(objdir) ; \ if test "$(OS)" = "Darwin" ; then \ - $(CXX) -dynamiclib -lboost_system -Wl,-dylib_install_name -Wl,$(libname_shared_major_version) -o $@ $(objects) ; \ + $(CXX) -dynamiclib $(libs) -Wl,-dylib_install_name -Wl,$(libname_shared_major_version) -o $@ $(objects) ; \ else \ - $(CXX) -shared -lboost_system -Wl,-soname,$(libname_shared_major_version) -o $@ $(objects) ; \ + $(CXX) -shared $(libs) -Wl,-soname,$(libname_shared_major_version) -o $@ $(objects) ; \ fi ; \ mv -f $@ ../ @echo "Link: Done"