* strip glib from avahi-core

[catta] / avahi-common / Makefile.am

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index 20eaee3eb398005cebaee4da372a4b3866c9652d..8ac6365760608112e5a1566ec938b8a392b9de94 100644 (file)
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -19,10 +19,6 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
@@ -36,17 +32,23 @@ avahi_commoninclude_HEADERS = \
        cdecl.h \
        defs.h \
        malloc.h
+       watch.h \
+       timeval.h \
+       simple-watch.h \
+       gccmacro.h
+
+noinst_HEADERS = llist.h
 
 if ENABLE_DBUS
-avahi_commoninclude_HEADERS += dbus.h
+noinst_HEADERS += dbus.h
 endif
 
-noinst_HEADERS = llist.h
-
 noinst_PROGRAMS = \
        strlst-test \
        domain-test \
-       alternative-test
+       alternative-test \
+       timeval-test \
+       watch-test
 
 lib_LTLIBRARIES = \
        libavahi-common.la 
@@ -57,7 +59,10 @@ libavahi_common_la_SOURCES = \
        alternative.c alternative.h \
        error.c error.h \
        strlst.c strlst.h \
-       domain.c domain.h
+       domain.c domain.h \
+       timeval.c timeval.h \
+       simple-watch.c simple-watch.h \
+       watch.h
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
 libavahi_common_la_LIBADD = $(AM_LDADD)
 
@@ -83,3 +88,19 @@ domain_test_SOURCES = \
 domain_test_CFLAGS = $(AM_CFLAGS)
 domain_test_LDADD = $(AM_LDADD)
 
+watch_test_SOURCES = \
+       timeval.c timeval.h \
+       simple-watch.c simple-watch.h \
+       watch.h \
+       malloc.c malloc.h \
+       watch-test.c
+watch_test_CFLAGS = $(AM_CFLAGS)
+watch_test_LDADD = $(AM_LDADD)
+
+timeval_test_SOURCES = \
+       timeval.c timeval.h \
+       timeval-test.c
+timeval_test_CFLAGS = $(AM_CFLAGS)
+timeval_test_LDADD = $(AM_LDADD)
+
+