X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-utils%2FMakefile.am;h=2066e4f8e8cd4e37829dcf7dac6ad4504d055df3;hb=93293a573bda5eae15813b4c771863f740a01dd1;hp=0c5b711b871b968700f24298a0389dbcf81930b2;hpb=854f901f491ccda79aee11edc3d59109cb229d28;p=catta

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 0c5b711..2066e4f 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -17,12 +17,15 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
+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
 
@@ -36,8 +39,6 @@ pythonscripts = \
 	avahi-publish-address \
 	avahi-publish-service \
 	avahi-bookmarks \
-	avahi-resolve-host-name \
-	avahi-resolve-address \
 	avahi-discover
 
 desktopdir = $(datadir)/applications
@@ -64,14 +65,6 @@ 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)
 
@@ -81,10 +74,20 @@ endif
 
 if HAVE_DBUS
 
-bin_PROGRAMS = avahi-browse
+bin_PROGRAMS = avahi-browse avahi-resolve-host-name
 
-avahi_browse_SOURCES = avahi-browse.c sigint.c
+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
 
+if HAVE_GDBM
+avahi_browse_SOURCES += stdb.h stdb.c
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_LDADD += -lgdbm
+endif
+
+avahi_resolve_host_name_SOURCES = avahi-resolve-host-name.c sigint.c sigint.h
+avahi_resolve_host_name_CFLAGS = $(AM_CFLAGS)
+avahi_resolve_host_name_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la
+
 endif