update diagram a bit

[catta] / avahi-core / Makefile.am

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index b692fcce33d0d0c0a87334bb81a015c4619529b8..e4dd771ac1ed9d653dd0b48320c7c9c3936da6d1 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -21,9 +21,12 @@ AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
 
 # GLIB 2.0
 AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS) ../avahi-common/libavahi-common.la
+AM_LDADD=$(GLIB20_LIBS)
 
-AM_CFLAGS+=-I$(top_srcdir)/avahi-common
+# Import stuff from avahi-common
+AM_CFLAGS+=-I$(top_srcdir)/avahi-common 
+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")'
@@ -40,7 +43,8 @@ noinst_PROGRAMS = \
        prioq-test \
        avahi-test \
        conformance-test \
-       avahi-reflector
+       avahi-reflector \
+       dns-test
 
 libavahi_core_la_SOURCES = \
        timeeventq.c timeeventq.h\
@@ -61,31 +65,45 @@ libavahi_core_la_SOURCES = \
        browse-domain.c \
        browse-service-type.c \
        browse-service.c \
-       resolve-service.c
+       resolve-service.c \
+       dns.c dns.h \
+       core.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 \
+       log.c log.h
+dns_test_CFLAGS = $(AM_CFLAGS)
+dns_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
 
 valgrind: avahi-test
        libtool --mode=execute valgrind ./avahi-test