X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2FMakefile.am;h=d1cba37b0d8795ac9c9c82c78f147621f66f539b;hb=15aaf28f0345ed6998ef6eae921c7750c4ce26f9;hp=4b755fc87179d3350b34721b84ad4bc8a8559198;hpb=769c00f228ba0d37217aaf1424dedde390e7a01c;p=catta

diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index 4b755fc..d1cba37 100644
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -19,42 +19,32 @@
 
 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")'
 
-if ENABLE_DBUS
+if HAVE_DBUS
 
 avahi_clientincludedir=$(includedir)/avahi-client
+avahi_clientinclude_HEADERS = client.h
 
-avahi_clientinclude_HEADERS = \
-	client.h
-
-noinst_HEADERS = \
-	internal.h
-	dbus-watch-glue.h
+noinst_HEADERS = internal.h
 
-noinst_PROGRAMS = \
-	client-test
+noinst_PROGRAMS = client-test
 
-lib_LTLIBRARIES = \
-	libavahi-client.la 
+lib_LTLIBRARIES = libavahi-client.la 
 
 libavahi_client_la_SOURCES = \
 	client.c client.h \
 	entrygroup.c \
 	browser.c \
-	dbus-watch-glue.c
+	resolver.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/libavahi-common.la ../avahi-common/libdbus-common.la
+libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
 
-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_SOURCES = client-test.c
+client_test_CFLAGS = $(AM_CFLAGS) 
+client_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la 
 
 endif