update diagram a bit

[catta] / avahi-core / Makefile.am

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 6fb08399ba1676899a3da999e29cc88db0ea01c4..e4dd771ac1ed9d653dd0b48320c7c9c3936da6d1 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")'
@@ -67,37 +68,42 @@ libavahi_core_la_SOURCES = \
        resolve-service.c \
        dns.c dns.h \
        core.h \
-       llist.h
+       llist.h \
+       log.c log.h \
+       browse-dns-server.c browse-dns-server.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.c \
+       log.c log.h
 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