X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2FMakefile;h=fc82e2aa122869fc5259944797e5d164211970e2;hb=96df23c96dad288efccfcb67254688cb00bcd907;hp=9b959abc21fffab213381489937415c3a1e60b78;hpb=5191e1cb38d24ebf5c180ac7911893ca8bc4031f;p=umurmur.git

diff --git a/src/Makefile b/src/Makefile
index 9b959ab..fc82e2a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,26 +2,44 @@ 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 voicetarget.c
 
 OBJS:=$(patsubst %.c, %.o, $(SRCS))
-#CFLAGS:=$(CFLAGS) -I. -I/data/export/proj/openssl/include/ -Wall -g -DDEBUG
-#LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl -lconfig
-CFLAGS:=$(CFLAGS) -I. -Wall -g
-LDFLAGS:=$(LDFLAGS) -lcrypto -lssl -lconfig
 
-umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)  
-	$(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd
+# **** Stuff used for debugging ******
+# For Valgrind OpenSSL
+#EXTRA_CFLAGS:=$(CFLAGS) -I/data/export/proj/openssl/include/
+#EXTRA_LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl
+
+# Debug
+CFLAGS:=$(CFLAGS) -DDEBUG -g
+# ********** Debug stuff END ************
+
+
+# Build support and link to PolarSSL
+# If PolarSSL is in a nonstandard place.
+POLARSSL_LIB:=../../../polarssl/polarssl-0.12.1/library/libpolarssl.a
+SSL_LIB:=$(POLARSSL_LIB) # If statically linking
+POLARSSL_INCLUDE:=../../../polarssl/polarssl-0.12.1/include
+EXTRA_CFLAGS:=-DUSE_POLARSSL -I$(POLARSSL_INCLUDE)
+# EXTRA_LDLAGS:=-lpolarssl
+
+
+# OpenSSL - usually installed at a standard place
+# EXTRA_CFLAGS:=
+# EXTRA_LDFLAGS:=-lcrypto -lssl 
+
+CFLAGS:=$(CFLAGS) -I. -Wall $(EXTRA_CFLAGS)
+LDFLAGS:=$(EXTRA_LDFLAGS) $(LDFLAGS) -lconfig 
+
+umurmurd:google/protobuf-c/libprotobuf_c.a $(OBJS)
+	$(CC) $(LDFLAGS) $(OBJS) $(SSL_LIB) google/protobuf-c/libprotobuf_c.a -o umurmurd
 
 google/protobuf-c/libprotobuf_c.a:
 	$(MAKE) -C google/protobuf-c/
 
 clean:
 	$(MAKE) -C google/protobuf-c/ clean
-	rm -f *.o umurmurd 
+	rm -f *.o umurmurd
 
 all: umurmurd
 
 $(OBJS): Makefile
 
-depend.mak:
-	$(CC) -M $(SRCS) > depend.mak
-
-include depend.mak
\ No newline at end of file