X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2FMakefile;h=0d8fe7764dcc150570c9668974569f7e6c0ee9ee;hb=454ad122eb158b4391e2690fe6a7e127d24c525b;hp=a93fc5a9480ea44fa37dc4be9e7441e53b4e5954;hpb=3f354796584346b4ecc6c1cf44bfe1c360c84ef7;p=umurmur.git

diff --git a/src/Makefile b/src/Makefile
index a93fc5a..0d8fe77 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,26 +3,43 @@ SRCS:=client.c main.c messages.c pds.c server.c ssl.c log.c conf.c crypt.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
+# **** 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
 
-umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)  
-	$(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd
+# 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 depend.mak
+	rm -f *.o umurmurd
 
 all: umurmurd
 
 $(OBJS): Makefile
 
-depend.mak:
-	$(CC) $(CFLAGS) -M $(SRCS) > depend.mak
-
-include depend.mak
\ No newline at end of file