projects
/
umurmur.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright year. Fix a typo in logging.
[umurmur.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index e66f475ec9e31f5fe5f89f3d0c88f76e841ea4a0..9b959abc21fffab213381489937415c3a1e60b78 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,18
+1,23
@@
-# 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))
OBJS:=$(patsubst %.c, %.o, $(SRCS))
-CFLAGS:=$(CFLAGS) -Wall -Os -g
+#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
LDFLAGS:=$(LDFLAGS) -lcrypto -lssl -lconfig
-umurmurd:$(OBJS) depend.mak
- $(CC) $(LDFLAGS) $(OBJS) -o umurmurd
+umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)
+ $(CC) $(LDFLAGS) $(OBJS) 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:
clean:
- rm *.o umurmurd
+ $(MAKE) -C google/protobuf-c/ clean
+ rm -f *.o umurmurd
-all: umurmur
+all: umurmur
d
$(OBJS): Makefile
$(OBJS): Makefile