X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2FMakefile.am;h=888b9171448e326a7c4375cbf16da860425a45e4;hb=1a04f21bca1c5410019b29c2b7305796ecb5a8b8;hp=2d5a6544a01b73f18742ba9a4c02379397d9ce0a;hpb=368ed1a2a0d95964b3f88c70c9a8c5516367f3f7;p=catta

diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index 2d5a654..888b917 100644
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -19,36 +19,43 @@
 
 AM_CFLAGS=-I$(top_srcdir)
 
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
-
-# 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 lookup.h publish.h
+
+noinst_HEADERS = internal.h
 
-avahi_clientinclude_HEADERS = \
-	client.h
+if ENABLE_TESTS
 
 noinst_PROGRAMS = \
-	client-test
+	client-test \
+	srv-test
 
-lib_LTLIBRARIES = \
-	libavahi-client.la 
+endif
 
-libavahi_client_la_SOURCES = \
-	client.c client.h
+lib_LTLIBRARIES = libavahi-client.la 
 
-client_test_SOURCES = \
-	client-test.c
-client_test_CFLAGS = $(AM_CFLAGS)
-client_test_LDADD = $(AM_LDADD) libavahi-client.la
+libavahi_client_la_SOURCES = \
+	client.c client.h \
+	entrygroup.c \
+	browser.c \
+	resolver.c \
+	publish.h lookup.h
+
+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_CFLAGS = $(AM_CFLAGS) 
+client_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.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