* Rename various data structures to prevent a namespace conflict with avahi-core

[catta] / avahi-core / Makefile.am

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 0c6b1e2f3161150eee0ca6f6eb36ca4adc8f690b..e15f295cadad8a35bad8837ebbc2f2b858855f49 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -26,7 +26,6 @@ AM_LDADD=$(GLIB20_LIBS)
 # 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")'
@@ -34,7 +33,9 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 avahiincludedir=$(includedir)/avahi-core
 
 avahiinclude_HEADERS = \
-       core.h
+       core.h \
+       log.h \
+       rr.h
 
 lib_LTLIBRARIES = \
        libavahi-core.la 
@@ -44,7 +45,9 @@ noinst_PROGRAMS = \
        avahi-test \
        conformance-test \
        avahi-reflector \
-       dns-test
+       dns-test \
+       timeeventq-test \
+       timeval-test
 
 libavahi_core_la_SOURCES = \
        timeeventq.c timeeventq.h\
@@ -67,10 +70,13 @@ libavahi_core_la_SOURCES = \
        browse-service.c \
        resolve-service.c \
        dns.c dns.h \
+       rr.c rr.h \
        core.h \
-       llist.h \
        log.c log.h \
-       browse-dns-server.c
+       browse-dns-server.c \
+       fdutil.h fdutil.c \
+       timeval.h timeval.c \
+       util.c util.h
 libavahi_core_la_CFLAGS = $(AM_CFLAGS)
 libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
 
@@ -78,32 +84,45 @@ prioq_test_SOURCES = \
        prioq-test.c  \
        prioq.c prioq.h
 prioq_test_CFLAGS = $(AM_CFLAGS)
-prioq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
 
 avahi_test_SOURCES = \
-       avahi-test.c \
-       $(libavahi_core_la_SOURCES)
+       avahi-test.c
 avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
 
 conformance_test_SOURCES = \
-       conformance-test.c \
-       $(libavahi_core_la_SOURCES)
+       conformance-test.c
 conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
 
 avahi_reflector_SOURCES = \
-       avahi-reflector.c \
-       $(libavahi_core_la_SOURCES)
+       avahi-reflector.c
 avahi_reflector_CFLAGS = $(AM_CFLAGS)
-avahi_reflector_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
 
 dns_test_SOURCES = \
        dns.c dns.h \
        dns-test.c \
-       log.c log.h
+       log.c log.h \
+       util.c util.h \
+       rr.c rr.h
 dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+
+timeeventq_test_SOURCES = \
+       timeeventq-test.c \
+       timeeventq.h timeeventq.c \
+       timeval.c timeval.h \
+       prioq.h prioq.c
+timeeventq_test_CFLAGS = $(AM_CFLAGS)
+timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+
+timeval_test_SOURCES = \
+       timeval.c timeval.h \
+       timeval-test.c
+timeval_test_CFLAGS = $(AM_CFLAGS)
+timeval_test_LDADD = $(AM_LDADD)
 
 valgrind: avahi-test
        libtool --mode=execute valgrind ./avahi-test