From: fatbob313 <martin@fatbob.nu>
Date: Wed, 17 Feb 2010 16:12:58 +0000 (+0000)
Subject: Try to clear up Makefile
X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;h=8b3725810856a8ed850e0e89b3122aaf76828f7d;p=umurmur.git

Try to clear up Makefile
---

diff --git a/src/Makefile b/src/Makefile
index 6294682..39db9ef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,29 +3,24 @@ 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 OpenSSL
 #EXTRA_CFLAGS:=$(CFLAGS) -I/data/export/proj/openssl/include/
 #EXTRA_LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl
 
-# PolarSSL
-# CFLAGS:=$(CFLAGS) -DUSE_POLARSSL -I$(POLARSSL_INCLUDE)
-# CFLAGS:=$(CFLAGS) -I$(POLARSSL_INCLUDE)
-# LDFLAGS:=$(LDFLAGS) -L $(POLARSSL_LIB) -lconfig
-
 # Debug
 # CFLAGS:=$(CFLAGS) -DDEBUG -g
-# ********** END ************
+# ********** 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
-# SSL_LIB:=$(POLARSSL_LIB) # If statically linking
+
 
 # OpenSSL - usually installed at a standard place
 # EXTRA_CFLAGS:=