X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2FMakefile.am;h=f11b11d7da59f5dbeae4dd25756811fdadb12e32;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=aaa772a167bcb75359fa120f0ab4232be78ba985;hpb=9e4237ebed07d00bf1176178d1358b475d749b27;p=catta

diff --git a/avahi-client/Makefile.am b/avahi-client/Makefile.am
index aaa772a..f11b11d 100644
--- a/avahi-client/Makefile.am
+++ b/avahi-client/Makefile.am
@@ -1,7 +1,5 @@
-# $Id: Makefile.am 90 2005-05-23 16:15:12Z lennart $
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -35,11 +33,12 @@ noinst_PROGRAMS = \
 	client-test \
 	srv-test \
 	xdg-config-test \
-	rr-test
+	rr-test \
+	check-nss-test
 
 endif
 
-lib_LTLIBRARIES = libavahi-client.la 
+lib_LTLIBRARIES = libavahi-client.la
 
 libavahi_client_la_SOURCES = \
 	client.c client.h \
@@ -47,26 +46,38 @@ libavahi_client_la_SOURCES = \
 	browser.c \
 	resolver.c \
 	publish.h lookup.h \
-	xdg-config.c xdg-config.h
+	xdg-config.c xdg-config.h \
+	check-nss.c \
+	../avahi-common/dbus.c ../avahi-common/dbus.h \
+	../avahi-common/dbus-watch-glue.c ../avahi-common/dbus-watch-glue.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)
+libavahi_client_la_LIBADD = $(AM_LDADD) $(DBUS_LIBS) ../avahi-common/libavahi-common.la
+libavahi_client_la_LDFLAGS = $(AM_LDFLAGS)  -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 
+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 
+srv_test_CFLAGS = $(AM_CFLAGS)
+srv_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
 
 rr_test_SOURCES = rr-test.c
-rr_test_CFLAGS = $(AM_CFLAGS) 
-rr_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la 
+rr_test_CFLAGS = $(AM_CFLAGS)
+rr_test_LDADD = $(AM_LDADD) libavahi-client.la ../avahi-common/libavahi-common.la
 
 xdg_config_test_SOURCES = xdg-config-test.c xdg-config.c xdg-config.h
-xdg_config_test_CFLAGS = $(AM_CFLAGS) 
+xdg_config_test_CFLAGS = $(AM_CFLAGS)
 xdg_config_test_LDADD = $(AM_LDADD)
 
+check_nss_test_SOURCES = check-nss.c check-nss-test.c client.h
+check_nss_test_CFLAGS = $(AM_CFLAGS)
+check_nss_test_LDADD = $(AM_LDADD)
+
+if HAVE_DLOPEN
+check_nss_test_LDADD += -ldl
+libavahi_client_la_LIBADD += -ldl
+endif
+
 endif