build-sys: compatibility with newer automake

[catta] / avahi-utils / Makefile.am

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index dc3a127de54b08867e60cf892238a479ad91a2e9..a1fc3a54930b5d1806a8af25873476fa1a4aa72b 100644 (file)
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -22,9 +20,11 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+pkglibdatadir=$(prefix)/lib/avahi
+
 if HAVE_DBUS
 
-bin_PROGRAMS = avahi-browse avahi-resolve avahi-publish
+bin_PROGRAMS = avahi-browse avahi-resolve avahi-publish avahi-set-host-name
 
 avahi_browse_SOURCES = avahi-browse.c sigint.c sigint.h
 avahi_browse_CFLAGS = $(AM_CFLAGS)
@@ -32,10 +32,15 @@ avahi_browse_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-com
 
 if HAVE_GDBM
 avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
 avahi_browse_LDADD += -lgdbm
 endif
 
+if HAVE_DBM
+avahi_browse_SOURCES += stdb.h stdb.c
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
+endif
+
 avahi_resolve_SOURCES = avahi-resolve.c sigint.c sigint.h
 avahi_resolve_CFLAGS = $(AM_CFLAGS)
 avahi_resolve_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
@@ -44,9 +49,13 @@ avahi_publish_SOURCES = avahi-publish.c sigint.c sigint.h
 avahi_publish_CFLAGS = $(AM_CFLAGS)
 avahi_publish_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
 
+avahi_set_host_name_SOURCES = avahi-set-host-name.c sigint.c sigint.h
+avahi_set_host_name_CFLAGS = $(AM_CFLAGS)
+avahi_set_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+
 install-exec-local:
        cd $(DESTDIR)/$(bindir) && \
-               rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains && \
+               rm -f avahi-resolve-host-name avahi-resolve-address avahi-browse-domains avahi-publish-address avahi-publish-service && \
                $(LN_S) avahi-resolve avahi-resolve-host-name && \
                $(LN_S) avahi-resolve avahi-resolve-address && \
                $(LN_S) avahi-browse avahi-browse-domains && \