* build libavahi-common statically for debugging purposes

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@108 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 94d373c13c0ea60722977d47e3cfdeba9d2b8a34..1235f92c84f7fb25b032d09825f5d6b3dcfac4b9 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -43,12 +43,21 @@ noinst_PROGRAMS = \
 lib_LTLIBRARIES = \
        libavahi-common.la 
 
+noinst_LIBRARIES = \
+       libavahi-common-static.a
+
 libavahi_common_la_SOURCES = \
        address.c address.h \
        strlst.c strlst.h \
        alternative.c alternative.h \
        rr.c rr.h \
        util.c util.h
+libavahi_common_la_CFLAGS = $(AM_CFLAGS)
+libavahi_common_la_LIBADD = $(AM_LDADD)
+
+libavahi_common_static_a_SOURCES = $(libavahi_common_la_SOURCES)
+libavahi_common_static_a_CFLAGS = $(AM_CFLAGS)
+libavahi_common_static_a_LIBADD =
 
 strlst_test_SOURCES = \
        strlst.c strlst.h \
@@ -67,3 +76,4 @@ domain_test_SOURCES = \
        domain-test.c
 domain_test_CFLAGS = $(AM_CFLAGS)
 domain_test_LDADD = $(AM_LDADD)
+

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 6fb08399ba1676899a3da999e29cc88db0ea01c4..ca7c385d788da440a631dfd78b63a8b07effe5cd 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -25,7 +25,8 @@ AM_LDADD=$(GLIB20_LIBS)
 
 # Import stuff from avahi-common
 AM_CFLAGS+=-I$(top_srcdir)/avahi-common 
-AM_LDADD+=../avahi-common/libavahi-common.la
+COMMON_LDADD=../avahi-common/libavahi-common.la
+STATIC_COMMON_LDADD=../avahi-common/libavahi-common-static.a
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
@@ -68,36 +69,38 @@ libavahi_core_la_SOURCES = \
        dns.c dns.h \
        core.h \
        llist.h
+libavahi_core_la_CFLAGS = $(AM_CFLAGS)
+libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
 
 prioq_test_SOURCES = \
        prioq-test.c  \
        prioq.c prioq.h
 prioq_test_CFLAGS = $(AM_CFLAGS)
-prioq_test_LDADD = $(AM_LDADD)
+prioq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 avahi_test_SOURCES = \
        avahi-test.c \
        $(libavahi_core_la_SOURCES)
 avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD)
+avahi_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 conformance_test_SOURCES = \
        conformance-test.c \
        $(libavahi_core_la_SOURCES)
 conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD)
+conformance_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 avahi_reflector_SOURCES = \
        avahi-reflector.c \
        $(libavahi_core_la_SOURCES)
 avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD)
+avahi_reflector_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 dns_test_SOURCES = \
        dns.c dns.h \
         dns-test.c
 dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD)
+dns_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 valgrind: avahi-test
        libtool --mode=execute valgrind ./avahi-test

diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 63c9f084182cb92d1fee391e488cefc5431dd0d4..bd642e81a570e3e186e42adf562a98eaf6fbe53a 100644 (file)
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -205,7 +205,7 @@ int main(int argc, char *argv[]) {
     loop = g_main_loop_new(NULL, FALSE);
     
     g_timeout_add(1000*5, dump_timeout, server);
-    g_timeout_add(1000*30, quit_timeout, loop);     
+    g_timeout_add(1000*60, quit_timeout, loop);     
     
     g_main_loop_run(loop);
     g_main_loop_unref(loop);