* strip glib from avahi-core

[catta] / avahi-core / Makefile.am

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index e15f295cadad8a35bad8837ebbc2f2b858855f49..a3005605dfdf4ca3d3d1553a8d2681ee977e0ed6 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -19,14 +19,12 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
 # Import stuff from avahi-common
-AM_CFLAGS+=-I$(top_srcdir)/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")'
 
@@ -47,7 +45,7 @@ noinst_PROGRAMS = \
        avahi-reflector \
        dns-test \
        timeeventq-test \
-       timeval-test
+       hashmap-test
 
 libavahi_core_la_SOURCES = \
        timeeventq.c timeeventq.h\
@@ -75,8 +73,9 @@ libavahi_core_la_SOURCES = \
        log.c log.h \
        browse-dns-server.c \
        fdutil.h fdutil.c \
-       timeval.h timeval.c \
-       util.c util.h
+       util.c util.h \
+       hashmap.c hashmap.h
+
 libavahi_core_la_CFLAGS = $(AM_CFLAGS)
 libavahi_core_la_LIBADD = $(AM_LDADD) $(COMMON_LDADD)
 
@@ -88,13 +87,13 @@ prioq_test_LDADD = $(AM_LDADD) $(COMMON_LDADD)
 
 avahi_test_SOURCES = \
        avahi-test.c
-avahi_test_CFLAGS = $(AM_CFLAGS)
-avahi_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+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
-conformance_test_CFLAGS = $(AM_CFLAGS)
-conformance_test_LDADD = $(AM_LDADD) $(COMMON_LDADD) libavahi-core.la
+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
@@ -106,23 +105,25 @@ dns_test_SOURCES = \
        dns-test.c \
        log.c log.h \
        util.c util.h \
-       rr.c rr.h
+       rr.c rr.h \
+       hashmap.c hashmap.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
+       prioq.h prioq.c \
+       log.c log.h
 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)
+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