X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2FMakefile.am;h=fdbeb90af279395da896d1507e799819718e7c22;hb=2a2ee0be70b99239f2cf99ea5b663eda965599f8;hp=0a5bffa5962c3109486c06f2691acae408885d95;hpb=86727e2f97a5e845d462178692c8574d226f22d7;p=catta

diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index 0a5bffa..fdbeb90 100644
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -22,35 +22,39 @@ AM_CFLAGS=-I$(top_srcdir)
 # 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
 
-noinst_HEADERS = \
-	internal.h
+if ENABLE_TESTS
 
 noinst_PROGRAMS = \
-	client-test
+	client-test \
+	srv-test
 
-lib_LTLIBRARIES = \
-	libavahi-client.la 
+endif
+
+lib_LTLIBRARIES = libavahi-client.la 
 
 libavahi_client_la_SOURCES = \
 	client.c client.h \
 	entrygroup.c \
-	browser.c
+	browser.c \
+	resolver.c
 
-libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-watch-glue.la
-libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info 0:0:0
+libavahi_client_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) -DDBUS_SYSTEM_BUS_DEFAULT_ADDRESS=\"$(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS)\"
+libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la ../avahi-common/libdbus-common-pic.la
+libavahi_client_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_CLIENT_VERSION_INFO)
 
-client_test_SOURCES = \
-	client-test.c
+client_test_SOURCES = client-test.c
+client_test_CFLAGS = $(AM_CFLAGS) 
+client_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.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
+srv_test_SOURCES = srv-test.c
+srv_test_CFLAGS = $(AM_CFLAGS) 
+srv_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la 
 
 endif