X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2FMakefile;h=af5aa3dd5cd8f4ebf55a6c850a0035cd870b78bd;hb=a605362cab90bdc81604fee1cbcbfbfe7849935d;hp=02addaff9f6bd511dd6db298aa7db82a575b3939;hpb=ac258369305673f3d17322b845ad58f2b9f64100;p=umurmur.git

diff --git a/src/Makefile b/src/Makefile
index 02addaf..af5aa3d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,28 +1,45 @@
-# build helloworld executable when user executes "make" 
-
 SRCS:=client.c main.c messages.c pds.c server.c ssl.c log.c conf.c crypt.c \
-	timer.c messagehandler.c channel.c Mumble.pb-c.c
+	timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c
 
 OBJS:=$(patsubst %.c, %.o, $(SRCS))
-CFLAGS:=$(CFLAGS) -I. -Wall -g -DDEBUG
-LDFLAGS:=$(LDFLAGS) -L/data/export/proj/protobuf/lib -lcrypto -lssl -lconfig
 
-umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)  
-	$(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd
+POLARSSL_LIB:=../../../../polarssl/polarssl-0.12.1/library/libpolarssl.a
+
+# For Valgrind
+#CFLAGS:=$(CFLAGS) -I. -I/data/export/proj/openssl/include/ -Wall -g -DDEBUG
+#LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl -lconfig
+
+# PolarSSL
+CFLAGS:=$(CFLAGS) -DDEBUG -DUSE_POLARSSL -I. -I../../../../polarssl/polarssl-0.12.1/include -Wall -g
+LDFLAGS:=$(LDFLAGS) -L  -lpolarssl -lconfig
+
+# OpenSSL
+#CFLAGS:=$(CFLAGS) -I. -Wall
+#LDFLAGS:=$(LDFLAGS) -L  -lcrypto -lssl -lconfig
+
+# Debug
+#CFLAGS:=$(CFLAGS) -DDEBUG -I. -Wall -g
+
+# PolarSSL
+umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS) $(POLARSSL_LIB)
+	$(CC) $(LDFLAGS) $(OBJS) $(POLARSSL_LIB) google/protobuf-c/libprotobuf_c.a -o umurmurd
+
+# OpenSSL
+#umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)
+#	$(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd
 
 google/protobuf-c/libprotobuf_c.a:
 	$(MAKE) -C google/protobuf-c/
 
-# remove object files and executable when user executes "make clean"
 clean:
 	$(MAKE) -C google/protobuf-c/ clean
-	rm -f *.o umurmurd 
+	rm -f *.o umurmurd depend.mak
 
 all: umurmurd
 
 $(OBJS): Makefile
 
 depend.mak:
-	$(CC) -M $(SRCS) > depend.mak
+	$(CC) $(CFLAGS) -M $(SRCS) > depend.mak
 
 include depend.mak
\ No newline at end of file