X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2FMakefile.am;h=15cbb575cfe5366318b7508e82cd30f9d9d68d5c;hb=e73e377dd5d15a6c31c04e977517a909cad7b5b1;hp=e1d64a4157a89b3387fa56cf56010a57d189e6f5;hpb=e614891d38cae63957d0bfc00d34ecdbad4f8322;p=catta diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am index e1d64a4..15cbb57 100644 --- a/avahi-daemon/Makefile.am +++ b/avahi-daemon/Makefile.am @@ -34,6 +34,7 @@ AM_CFLAGS+= \ -DAVAHI_SOCKET=\"$(avahi_socket)\" \ -DAVAHI_SERVICE_DIR=\"$(servicedir)\" \ -DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi-daemon.conf\" \ + -DAVAHI_HOSTS_FILE=\"$(pkgsysconfdir)/hosts\" \ -DAVAHI_DBUS_INTROSPECTION_DIR=\"$(introspectiondir)\" \ -DAVAHI_CONFIG_DIR=\"$(pkgsysconfdir)\" @@ -49,8 +50,10 @@ avahi_daemon_SOURCES = \ main.c main.h \ simple-protocol.c simple-protocol.h \ static-services.c static-services.h \ + static-hosts.c static-hosts.h \ ini-file-parser.c ini-file-parser.h \ - setproctitle.c setproctitle.h + setproctitle.c setproctitle.h \ + ../avahi-client/check-nss.c avahi_daemon_CFLAGS = $(AM_CFLAGS) $(LIBDAEMON_CFLAGS) avahi_daemon_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la $(LIBDAEMON_LIBS) -lexpat @@ -63,7 +66,8 @@ ini_file_parser_test_CFLAGS = $(AM_CFLAGS) ini_file_parser_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la pkgsysconf_DATA = \ - avahi-daemon.conf + avahi-daemon.conf \ + hosts service_DATA = \ ssh.service @@ -81,6 +85,10 @@ avahi_daemon_LDADD += -lcap endif +if HAVE_DLOPEN +avahi_daemon_LDADD += -ldl +endif + if HAVE_DBUS dbusservicedir=$(DBUS_SYS_DIR) @@ -101,16 +109,11 @@ avahi_daemon_SOURCES += \ dbus-sync-service-resolver.c \ dbus-record-browser.c \ ../avahi-common/dbus.c ../avahi-common/dbus.h \ - ../avahi-common/dbus-watch-glue.c ../avahi-common/dbus-watch-glue.h \ - ../avahi-client/check-nss.c + ../avahi-common/dbus-watch-glue.c ../avahi-common/dbus-watch-glue.h avahi_daemon_LDADD += \ $(DBUS_LIBS) -if HAVE_DLOPEN -avahi_daemon_LDADD += -ldl -endif - avahi_daemon_CFLAGS += $(DBUS_CFLAGS) dbusservice_DATA = avahi-dbus.conf @@ -145,6 +148,7 @@ EXTRA_DIST = \ HostNameResolver.introspect \ RecordBrowser.introspect \ ssh.service \ + hosts \ example.service \ introspect.dtd \ introspect.xsl @@ -154,3 +158,6 @@ xmllint: for F in $(introspection_DATA) ; do \ xmllint --noout --valid $$F ; \ done + +install-data-local: + test -z "$(localstatedir)/run" || $(mkdir_p) "$(DESTDIR)$(localstatedir)/run"