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

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 94d373c13c0ea60722977d47e3cfdeba9d2b8a34..d91343b317eb798798c7c9df8ebdfdd7acb4b8c0 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
+AM_CFLAGS=-I$(top_srcdir)
 
 # GLIB 2.0
 AM_CFLAGS+=$(GLIB20_CFLAGS)
@@ -28,12 +28,21 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 avahi_commonincludedir=$(includedir)/avahi-common
 
-avahi_commoninclude_HEADERS =
+avahi_commoninclude_HEADERS = \
        strlst.h \
        address.h \
        alternative.h \
-       rr.h \
-       util.h
+       domain.h \
+       cdecl.h \
+       defs.h \
+       malloc.h
+
+noinst_HEADERS = llist.h
+
+if ENABLE_DBUS
+noinst_HEADERS += dbus.h
+endif
+
 
 noinst_PROGRAMS = \
        strlst-test \
@@ -44,26 +53,34 @@ lib_LTLIBRARIES = \
        libavahi-common.la 
 
 libavahi_common_la_SOURCES = \
+       malloc.c malloc.h \
        address.c address.h \
-       strlst.c strlst.h \
        alternative.c alternative.h \
-       rr.c rr.h \
-       util.c util.h
+       error.c error.h \
+       strlst.c strlst.h \
+       domain.c domain.h
+libavahi_common_la_CFLAGS = $(AM_CFLAGS)
+libavahi_common_la_LIBADD = $(AM_LDADD)
 
 strlst_test_SOURCES = \
        strlst.c strlst.h \
-        strlst-test.c
+       malloc.c malloc.h \
+       strlst-test.c
 strlst_test_CFLAGS = $(AM_CFLAGS)
 strlst_test_LDADD = $(AM_LDADD)
 
 alternative_test_SOURCES = \
        alternative.c alternative.h \
-        alternative-test.c
+       malloc.c malloc.h \
+       domain.c domain.h \
+       alternative-test.c
 alternative_test_CFLAGS = $(AM_CFLAGS)
 alternative_test_LDADD = $(AM_LDADD)
 
 domain_test_SOURCES = \
-       util.c util.h \
+       domain.c domain.h \
+       malloc.c malloc.h \
        domain-test.c
 domain_test_CFLAGS = $(AM_CFLAGS)
 domain_test_LDADD = $(AM_LDADD)
+