From 6e474ccfc082868cb2606d5db1f79317f86b0a55 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 30 Jul 2012 18:06:03 +0000 Subject: [PATCH] add appropriate threading compile flags --- daemon/Makefile | 11 ++++++++--- daemon/main.c | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/daemon/Makefile b/daemon/Makefile index 2f5cf5abe..6657f572d 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -1,5 +1,8 @@ CC= gcc -CFLAGS= -g -Wall `pkg-config --cflags glib-2.0` `pcre-config --cflags` -fno-strict-aliasing +CFLAGS= -g -Wall -pthread -fno-strict-aliasing +CFLAGS+= `pkg-config --cflags glib-2.0` +CFLAGS+= `pkg-config --cflags gthread-2.0` +CFLAGS+= `pcre-config --cflags` CFLAGS+= -I/lib/modules/`uname -r`/build/include/ -I../kernel-module/ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -DMEDIAPROXY_VERSION="\"$(shell dpkg-parsechangelog -l../debian/changelog | awk '/^Version: / {print $$2}')\"" @@ -11,9 +14,11 @@ else CFLAGS+= -O2 endif -LDFLAGS= `pkg-config --libs glib-2.0` `pcre-config --libs` +LDFLAGS= -ldl -rdynamic +LDFLAGS+= `pkg-config --libs glib-2.0` +LDFLAGS+= `pkg-config --libs gthread-2.0` +LDFLAGS+= `pcre-config --libs` LDFLAGS+= `xmlrpc-c-config client --libs` -LDFLAGS+= -ldl -rdynamic SRCS= main.c kernel.c poller.c aux.c control.c streambuf.c call.c control_udp.c redis.c OBJS= $(SRCS:.c=.o) diff --git a/daemon/main.c b/daemon/main.c index e21ff4d79..9f5f972e4 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -274,6 +274,7 @@ int main(int argc, char **argv) { const char **strp; options(&argc, &argv); + g_thread_init(NULL); signals(); resources();