X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2FMakefile.am;h=1b0443cb949d7f98b729d13eb4ff8414c1f66f77;hb=7b124f6ae362a575460d2374dca39ebdce07c714;hp=d3a1f392f674b213fbf3e8763ba43a40c1a37a63;hpb=48f053dc87279e2e3cad561db5b744cbcbf32387;p=catta

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index d3a1f39..1b0443c 100644
--- 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,79 +20,44 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-EXTRA_DIST = \
-	avahi-publish-address.in \
-	avahi-publish-service.in \
-	avahi-bookmarks.in \
-	avahi-resolve-host-name.in \
-	avahi-resolve-address.in \
-	avahi-discover.in \
-	avahi-discover.desktop.in
-
-SUBDIRS=avahi
-
-if HAVE_PYTHON
-if HAVE_PYTHON_DBUS
-if HAVE_PYGTK
-
-pythonscripts = \
-	avahi-publish-address \
-	avahi-publish-service \
-	avahi-bookmarks \
-	avahi-resolve-host-name \
-	avahi-resolve-address \
-	avahi-discover
-
-desktopdir = $(datadir)/applications
-desktop_DATA = avahi-discover.desktop
-
-avahi-discover.desktop: avahi-discover.desktop.in
-	sed -e 's,@bindir\@,$(bindir),g' $< > $@
-	chmod +x $@
-
-avahi-discover: avahi-discover.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' \
-		-e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
-	chmod +x $@
-
-avahi-publish-address: avahi-publish-address.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-	chmod +x $@
-
-avahi-publish-service: avahi-publish-service.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-	chmod +x $@
-
-avahi-bookmarks: avahi-bookmarks.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-	chmod +x $@
-
-avahi-resolve-host-name: avahi-resolve-host-name.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-	chmod +x $@
-
-avahi-resolve-address: avahi-resolve-address.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
-	chmod +x $@
-
-bin_SCRIPTS = $(pythonscripts)
-CLEANFILES = $(pythonscripts) $(desktop_DATA)
-
-endif
-endif
-endif
-
 if HAVE_DBUS
 
-bin_PROGRAMS = avahi-browse
+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)
-avahi_browse_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la -lgdbm
+avahi_browse_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
 
 if HAVE_GDBM
 avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+avahi_browse_LDADD += -lgdbm
 endif
 
+if HAVE_DBM
+avahi_browse_SOURCES += stdb.h stdb.c
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/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
+
+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 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 && \
+		$(LN_S) avahi-publish avahi-publish-address && \
+		$(LN_S) avahi-publish avahi-publish-service
+
 endif