Reorganization

[umurmur.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 02addaff9f6bd511dd6db298aa7db82a575b3939..f3856d9b52a9cd2d9a4d41edbb8a25ad185a10a8 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,11 +1,11 @@
-# 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
+       timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c
 
 OBJS:=$(patsubst %.c, %.o, $(SRCS))
-CFLAGS:=$(CFLAGS) -I. -Wall -g -DDEBUG
-LDFLAGS:=$(LDFLAGS) -L/data/export/proj/protobuf/lib -lcrypto -lssl -lconfig
+#CFLAGS:=$(CFLAGS) -I. -I/data/export/proj/openssl/include/ -Wall -g -DDEBUG
+#LDFLAGS:=$(LDFLAGS) -L/data/export/proj/openssl/lib/ -lcrypto -lssl -lconfig
+CFLAGS:=$(CFLAGS) -I. -Wall -g
+LDFLAGS:=$(LDFLAGS) -lcrypto -lssl -lconfig
 
 umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)  
        $(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd
@@ -13,7 +13,6 @@ umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)
 google/protobuf-c/libprotobuf_c.a:
        $(MAKE) -C google/protobuf-c/
 
-# remove object files and executable when user executes "make clean"
 clean:
        $(MAKE) -C google/protobuf-c/ clean
        rm -f *.o umurmurd 
@@ -23,6 +22,6 @@ all: umurmurd
 $(OBJS): Makefile
 
 depend.mak:
-       $(CC) -M $(SRCS) > depend.mak
+       $(CC) $(CFLAGS) -M $(SRCS) > depend.mak
 
 include depend.mak
\ No newline at end of file