X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2FMakefile;h=02addaff9f6bd511dd6db298aa7db82a575b3939;hb=17ff75bcd300b8523afa53be4b7058ea2a5cbdf1;hp=e66f475ec9e31f5fe5f89f3d0c88f76e841ea4a0;hpb=6a6908d7031a79b5767d86a4da056f65a742ac9f;p=umurmur.git

diff --git a/src/Makefile b/src/Makefile
index e66f475..02addaf 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,18 +1,24 @@
 # 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
+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
+
 OBJS:=$(patsubst %.c, %.o, $(SRCS))
-CFLAGS:=$(CFLAGS) -Wall -Os -g
-LDFLAGS:=$(LDFLAGS) -lcrypto -lssl -lconfig
+CFLAGS:=$(CFLAGS) -I. -Wall -g -DDEBUG
+LDFLAGS:=$(LDFLAGS) -L/data/export/proj/protobuf/lib -lcrypto -lssl -lconfig
+
+umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)  
+	$(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd
 
-umurmurd:$(OBJS) depend.mak
-	$(CC) $(LDFLAGS) $(OBJS) -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