* 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 af7830c0b54bf23b2069cc1203b881419a58b1db..e15f295cadad8a35bad8837ebbc2f2b858855f49 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -34,7 +34,8 @@ avahiincludedir=$(includedir)/avahi-core
 
 avahiinclude_HEADERS = \
        core.h \
-       log.h
+       log.h \
+       rr.h
 
 lib_LTLIBRARIES = \
        libavahi-core.la 
@@ -45,7 +46,8 @@ noinst_PROGRAMS = \
        conformance-test \
        avahi-reflector \
        dns-test \
-       timeeventq-test
+       timeeventq-test \
+       timeval-test
 
 libavahi_core_la_SOURCES = \
        timeeventq.c timeeventq.h\
@@ -68,9 +70,13 @@ libavahi_core_la_SOURCES = \
        browse-service.c \
        resolve-service.c \
        dns.c dns.h \
+       rr.c rr.h \
        core.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)
 
@@ -98,17 +104,26 @@ 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) $(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