* strip glib from avahi-core

[catta] / avahi-core / Makefile.am

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index cd22097e27ca417556fdef3b61adefbb7f4896eb..a3005605dfdf4ca3d3d1553a8d2681ee977e0ed6 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -17,83 +17,113 @@
 # 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)
-AM_LDADD=$(GLIB20_LIBS)
+# Import stuff from avahi-common
+COMMON_LDADD=../avahi-common/libavahi-common.la
+
+# 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
+
+avahiinclude_HEADERS = \
+       core.h \
+       log.h \
+       rr.h
+
 lib_LTLIBRARIES = \
        libavahi-core.la 
 
 noinst_PROGRAMS = \
-       dns-test \
-       domain-test \
        prioq-test \
-       strlst-test \
        avahi-test \
-       alternative-test
+       conformance-test \
+       avahi-reflector \
+       dns-test \
+       timeeventq-test \
+       hashmap-test
 
 libavahi_core_la_SOURCES = \
        timeeventq.c timeeventq.h\
        iface.c iface.h \
        netlink.c netlink.h \
        server.c server.h \
-       address.c address.h \
-       util.c util.h \
        prioq.c prioq.h \
        cache.c cache.h\
-       rr.c rr.h \
-       dns.c dns.h \
        socket.c socket.h \
-       psched.c psched.h \
+       response-sched.c response-sched.h \
+       query-sched.c query-sched.h \
+       probe-sched.c probe-sched.h \
        announce.c announce.h \
-       subscribe.c subscribe.h \
-       strlst.c strlst.h \
-       rrlist.c rrlist.h
+       browse.c browse.h \
+       rrlist.c rrlist.h \
+       resolve-host-name.c \
+       resolve-address.c \
+       browse-domain.c \
+       browse-service-type.c \
+       browse-service.c \
+       resolve-service.c \
+       dns.c dns.h \
+       rr.c rr.h \
+       core.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)
 
 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) $(COMMON_LDADD)
+
+avahi_test_SOURCES = \
+       avahi-test.c
+avahi_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS)
 
-strlst_test_SOURCES = \
-       strlst-test.c \
-       strlst.c strlst.h
-strlst_test_CFLAGS = $(AM_CFLAGS)
-strlst_test_LDADD = $(AM_LDADD)
+conformance_test_SOURCES = \
+       conformance-test.c
+conformance_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la $(GLIB_LDADD) $(GLIB20_LIBS)
 
-domain_test_SOURCES = \
-       domain-test.c \
-       util.c util.h
-domain_test_CFLAGS = $(AM_CFLAGS)
-domain_test_LDADD = $(AM_LDADD)
+avahi_reflector_SOURCES = \
+       avahi-reflector.c
+avahi_reflector_CFLAGS = $(AM_CFLAGS)
+avahi_reflector_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
 
 dns_test_SOURCES = \
+       dns.c dns.h \
        dns-test.c \
+       log.c log.h \
        util.c util.h \
-       dns.c dns.h \
        rr.c rr.h \
-       strlst.c strlst.h
+       hashmap.c hashmap.h
 dns_test_CFLAGS = $(AM_CFLAGS)
-dns_test_LDADD = $(AM_LDADD)
-
-avahi_test_SOURCES = \
-       avahi-test.c \
-       $(libavahi_core_la_SOURCES)
+dns_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
 
-avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_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)
 
-alternative_test_SOURCES = \
-       alternative-test.c \
-       util.c util.h
-alternative_test_CFLAGS = $(AM_CFLAGS)
-alternative_test_LDADD = $(AM_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