diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 1 | ||||
| -rw-r--r-- | avahi-discover-standalone/Makefile.am (renamed from avahi-discover/Makefile.am) | 8 | ||||
| -rw-r--r-- | avahi-discover-standalone/avahi-discover.glade (renamed from avahi-discover/avahi-discover.glade) | 0 | ||||
| -rw-r--r-- | avahi-discover-standalone/avahi-discover.gladep (renamed from avahi-discover/avahi-discover.gladep) | 0 | ||||
| -rw-r--r-- | avahi-discover-standalone/main.c (renamed from avahi-discover/main.c) | 0 | ||||
| -rw-r--r-- | avahi-utils/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 |
8 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 874b9fc..a8b50d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS = -I common include $(srcdir)/common/doxygen.mk EXTRA_DIST = bootstrap.sh LICENSE $(DX_CONFIG) -SUBDIRS = common avahi-common avahi-core avahi-discover avahi-client avahi-daemon initscript avahi-dnsconfd avahi-utils examples +SUBDIRS = common avahi-common avahi-core avahi-discover-standalone avahi-client avahi-daemon initscript avahi-dnsconfd avahi-utils examples pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = avahi-core.pc diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000..4d07999 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1 @@ +sinclude(common/doxygen.m4)
\ No newline at end of file diff --git a/avahi-discover/Makefile.am b/avahi-discover-standalone/Makefile.am index 7890522..2d3ddaf 100644 --- a/avahi-discover/Makefile.am +++ b/avahi-discover-standalone/Makefile.am @@ -28,13 +28,13 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' if ENABLE_GTK bin_PROGRAMS = \ - avahi-discover + avahi-discover-standalone -avahi_discover_SOURCES = \ +avahi_discover_standalone_SOURCES = \ main.c -avahi_discover_CFLAGS = $(AM_CFLAGS) -avahi_discover_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la +avahi_discover_standalone_CFLAGS = $(AM_CFLAGS) +avahi_discover_standalone_LDADD = $(AM_LDADD) ../avahi-core/libavahi-core.la ../avahi-common/libavahi-common.la interfaces = \ avahi-discover.glade diff --git a/avahi-discover/avahi-discover.glade b/avahi-discover-standalone/avahi-discover.glade index ca6b51f..ca6b51f 100644 --- a/avahi-discover/avahi-discover.glade +++ b/avahi-discover-standalone/avahi-discover.glade diff --git a/avahi-discover/avahi-discover.gladep b/avahi-discover-standalone/avahi-discover.gladep index a9feaa6..a9feaa6 100644 --- a/avahi-discover/avahi-discover.gladep +++ b/avahi-discover-standalone/avahi-discover.gladep diff --git a/avahi-discover/main.c b/avahi-discover-standalone/main.c index daecdaa..daecdaa 100644 --- a/avahi-discover/main.c +++ b/avahi-discover-standalone/main.c diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am index 64781d2..c2c7842 100644 --- a/avahi-utils/Makefile.am +++ b/avahi-utils/Makefile.am @@ -20,7 +20,11 @@ SUBDIRS=avahi if HAVE_PYTHON -bin_SCRIPTS = avahi-publish-address avahi-publish-service avahi-dump-all +bin_SCRIPTS = \ + avahi-publish-address \ + avahi-publish-service \ + avahi-dump-all \ + avahi-discover endif CLEANFILES = $(bin_SCRIPTS) diff --git a/configure.ac b/configure.ac index 4d12a0c..dee7593 100644 --- a/configure.ac +++ b/configure.ac @@ -278,7 +278,7 @@ avahi-common/Makefile avahi-core/Makefile avahi-daemon/Makefile avahi-daemon/avahi-dbus.conf -avahi-discover/Makefile +avahi-discover-standalone/Makefile avahi-client/Makefile initscript/Makefile initscript/Debian/Makefile |