* strip glib from avahi-core

[catta] / avahi-core / Makefile.am

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 07466229b0ae96a7347e050a372dc450fb5e58d0..a3005605dfdf4ca3d3d1553a8d2681ee977e0ed6 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -17,24 +17,23 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir) -D_GNU_SOURCE
-
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+AM_CFLAGS=-I$(top_srcdir)
 
 # 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
+
+# Import stuff from avahi-glib
+GLIB_LDADD=../avahi-glib/libavahi-glib.la
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-avahiincludedir=$(includedir)/avahi-core 
+avahiincludedir=$(includedir)/avahi-core
 
-avahiinclude_HEADERS =
-       core.h
+avahiinclude_HEADERS = \
+       core.h \
+       log.h \
+       rr.h
 
 lib_LTLIBRARIES = \
        libavahi-core.la 
@@ -44,7 +43,9 @@ noinst_PROGRAMS = \
        avahi-test \
        conformance-test \
        avahi-reflector \
-       dns-test
+       dns-test \
+       timeeventq-test \
+       hashmap-test
 
 libavahi_core_la_SOURCES = \
        timeeventq.c timeeventq.h\
@@ -67,9 +68,14 @@ 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
+       log.c log.h \
+       browse-dns-server.c \
+       fdutil.h fdutil.c \
+       util.c util.h \
+       hashmap.c hashmap.h
+
 libavahi_core_la_CFLAGS = $(AM_CFLAGS)
 libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
 
@@ -77,32 +83,47 @@ 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_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+       avahi-test.c
+avahi_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS)
 
 conformance_test_SOURCES = \
-       conformance-test.c \
-       $(libavahi_core_la_SOURCES)
-conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+       conformance-test.c
+conformance_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS)
 
 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 \
+       hashmap.c hashmap.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 \
+       prioq.h prioq.c \
+       log.c log.h
+timeeventq_test_CFLAGS = $(AM_CFLAGS)
+timeeventq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
+
+hashmap_test_SOURCES = \
+       hashmap-test.c \
+       hashmap.h hashmap.c \
+       util.h util.c
+hashmap_test_CFLAGS = $(AM_CFLAGS)
+hashmap_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
 
 valgrind: avahi-test
        libtool --mode=execute valgrind ./avahi-test