projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e86df97
)
Makefile with new voicetarget files too...
author
fatbob313
<martin@fatbob.nu>
Wed, 6 Jan 2010 16:54:37 +0000
(16:54 +0000)
committer
fatbob313
<martin@fatbob.nu>
Wed, 6 Jan 2010 16:54:37 +0000
(16:54 +0000)
src/Makefile
patch
|
blob
|
history
diff --git
a/src/Makefile
b/src/Makefile
index 02addaff9f6bd511dd6db298aa7db82a575b3939..090f81b130df1a1e1722f9f905ddd0e99fa0c829 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-1,11
+1,13
@@
# 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 \
# 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))
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
umurmurd:google/protobuf-c/libprotobuf_c.a depend.mak $(OBJS)
$(CC) $(LDFLAGS) $(OBJS) google/protobuf-c/libprotobuf_c.a -o umurmurd