Update to version 0.2.3

[umurmur.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index af5aa3dd5cd8f4ebf55a6c850a0035cd870b78bd..fc82e2aa122869fc5259944797e5d164211970e2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,43 +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))
 
-POLARSSL_LIB:=../../../../polarssl/polarssl-0.12.1/library/libpolarssl.a
+# **** 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
 
-# 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
+# Debug
+CFLAGS:=$(CFLAGS) -DDEBUG -g
+# ********** Debug stuff END ************
 
-# 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
+# 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
 
-# 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 - usually installed at a standard place
+# EXTRA_CFLAGS:=
+# EXTRA_LDFLAGS:=-lcrypto -lssl 
 
-# OpenSSL
-#umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)
-#      $(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd
+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