X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2FMakefile;h=0d8fe7764dcc150570c9668974569f7e6c0ee9ee;hb=6eced75599b2c74826f9b154f81b92250b38b98b;hp=100f84576bd4bb463dcdedbd2c3149c9af83f610;hpb=de391bf21ea3739d52e7f8b8c3c1b9df27b4537c;p=umurmur.git

diff --git a/src/Makefile b/src/Makefile
index 100f845..0d8fe77 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,37 +3,33 @@ SRCS:=client.c main.c messages.c pds.c server.c ssl.c log.c conf.c crypt.c \
 
 OBJS:=$(patsubst %.c, %.o, $(SRCS))
 
-# If PolarSSL is in a nonstandard place. Usually not available in e.g. Fedora.
-POLARSSL_LIB:=../../../../polarssl/polarssl-0.12.1/library/libpolarssl.a
-POLARSSL_INCLUDE:=../../../../polarssl/polarssl-0.12.1/include
-
 # **** Stuff used for debugging ******
-# For Valgrind
-#CFLAGS:=$(CFLAGS) -I. -I/data/export/proj/openssl/include/ -Wall
-#LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl -lconfig
-
-# PolarSSL
-#CFLAGS:=$(CFLAGS) -DUSE_POLARSSL -I. -I$(POLARSSL_INCLUDE) -Wall
-#LDFLAGS:=$(LDFLAGS) -L  $(POLARSSL_LIB) -lconfig
+# 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
-# ********** END ************
+# CFLAGS:=$(CFLAGS) -DDEBUG -g
+# ********** Debug stuff END ************
 
 
 # Build support and link to PolarSSL
-#EXTRA_CFLAGS:=-DUSE_POLARSSL -I$(POLARSSL_INCLUDE)
-#EXTRA_LDLAGS:=-lpolarssl
-#SSL_LIB:=$(POLARSSL_LIB)
+# 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
-EXTRA_CFFLAGS:=
-EXTRA_LDFLAGS:=-lcrypto -lssl 
+
+# OpenSSL - usually installed at a standard place
+# EXTRA_CFLAGS:=
+# EXTRA_LDFLAGS:=-lcrypto -lssl 
 
 CFLAGS:=$(CFLAGS) -I. -Wall $(EXTRA_CFLAGS)
-LDFLAGS:=$(LDFLAGS) -lconfig $(EXTRA_LDFLAGS)
+LDFLAGS:=$(EXTRA_LDFLAGS) $(LDFLAGS) -lconfig 
 
-umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)
+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:
@@ -41,13 +37,9 @@ google/protobuf-c/libprotobuf_c.a:
 
 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