Merge pull request #3 from lano1106/working

Make trickle thread-safe
mariusae · Dec 2, 2013 · 54b96fb · 54b96fb
2 parents e91eb49 + 56637e7
commit 54b96fb
Show file tree

Hide file tree

Showing 10 changed files with 28,594 additions and 25,046 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -17,18 +17,18 @@ man_MANS = trickle.1 trickled.8 trickled.conf.5
 
 bin_PROGRAMS = trickle trickled tricklectl
 
-trickle_DEPENDENCIES = @ERRO@ @LIBOBJS@
+trickle_DEPENDENCIES = @ERRO@ $(LIBOBJS)
 trickle_SOURCES = trickle.c util.c getopt.c
-trickle_LDADD = @ERRO@ @LIBOBJS@
+trickle_LDADD = @ERRO@ $(LIBOBJS)
 
 trickled_SOURCES = trickled.c atomicio.c print.c bwstat.c client.c conf.c \
                    util.c cleanup.c getopt.c xdr.c
-trickled_LDADD = @EVENTLIB@ @LIBOBJS@
+trickled_LDADD = @EVENTLIB@ $(LIBOBJS)
 
 tricklectl_SOURCES = tricklectl.c trickledu.c atomicio.c xdr.c
-tricklectl_LDADD = @ERRO@ @LIBOBJS@
+tricklectl_LDADD = @ERRO@ $(LIBOBJS)
 
-AM_CFLAGS += -Wall -Icompat @EVENTINC@
+AM_CFLAGS = -Wall -Icompat @EVENTINC@
 
 overloaddir = $(libdir)
 overload_DATA = libtrickle.so