From deb6bcac8d1e1ecec4aafaee2d27dbe467e4f461 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 15 Aug 2005 02:42:59 +0000 Subject: * implement ini file parser * strip glib usage from avahi-daemon * make dbus-watch-glue a static library so that both avahi-client and avahi-daemon can make use of it git-svn-id: file:///home/lennart/svn/public/avahi/trunk@327 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-client/Makefile.am | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'avahi-client/Makefile.am') diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am index 4b755fc..91dbd38 100644 --- a/avahi-client/Makefile.am +++ b/avahi-client/Makefile.am @@ -19,10 +19,6 @@ AM_CFLAGS=-I$(top_srcdir) -# DBUS -AM_CFLAGS+=$(DBUS_CFLAGS) -AM_LDADD=$(DBUS_LIBS) - # This cool debug trap works on i386/gcc only AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' @@ -35,7 +31,6 @@ avahi_clientinclude_HEADERS = \ noinst_HEADERS = \ internal.h - dbus-watch-glue.h noinst_PROGRAMS = \ client-test @@ -46,15 +41,15 @@ lib_LTLIBRARIES = \ libavahi_client_la_SOURCES = \ client.c client.h \ entrygroup.c \ - browser.c \ - dbus-watch-glue.c + browser.c -libavahi_client_la_CFLAGS = $(AM_CFLAGS) -libavahi_client_la_LIBADD = $(AM_LDADD) +libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) +libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libdbus-watch-glue.a client_test_SOURCES = \ client-test.c -client_test_CFLAGS = $(AM_CFLAGS) -client_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la ../avahi-glib/libavahi-glib.la + +client_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS) +client_test_LDADD = $(AM_LDADD) $(GLIB20_LIBS) libavahi-client.la ../avahi-common/libavahi-common.la ../avahi-glib/libavahi-glib.la endif -- cgit