X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2FMakefile;h=0d8fe7764dcc150570c9668974569f7e6c0ee9ee;hb=3fd1970fe4af3dd1ee053b41cd0ce7d957f93b87;hp=e66f475ec9e31f5fe5f89f3d0c88f76e841ea4a0;hpb=6a6908d7031a79b5767d86a4da056f65a742ac9f;p=umurmur.git

diff --git a/src/Makefile b/src/Makefile
index e66f475..0d8fe77 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,22 +1,45 @@
-# build helloworld executable when user executes "make" 
+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
 
-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
 OBJS:=$(patsubst %.c, %.o, $(SRCS))
-CFLAGS:=$(CFLAGS) -Wall -Os -g
-LDFLAGS:=$(LDFLAGS) -lcrypto -lssl -lconfig
 
-umurmurd:$(OBJS) depend.mak
-	$(CC) $(LDFLAGS) $(OBJS) -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/
 
-# remove object files and executable when user executes "make clean"
 clean:
-	rm *.o umurmurd 
+	$(MAKE) -C google/protobuf-c/ clean
+	rm -f *.o umurmurd
 
-all: umurmur
+all: umurmurd
 
 $(OBJS): Makefile
 
-depend.mak:
-	$(CC) -M $(SRCS) > depend.mak
-
-include depend.mak
\ No newline at end of file