--- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -63,11 +63,15 @@ # # This is usually added to MOSTLYCLEANFILES. +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -82,10 +86,16 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/common/doxygen.mk \ - $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ - ChangeLog compile config.guess config.rpath config.sub depcomp \ - install-sh ltmain.sh missing py-compile + $(srcdir)/Makefile.in $(srcdir)/avahi-client.pc.in \ + $(srcdir)/avahi-compat-howl.pc.in \ + $(srcdir)/avahi-compat-libdns_sd.pc.in \ + $(srcdir)/avahi-core.pc.in $(srcdir)/avahi-glib.pc.in \ + $(srcdir)/avahi-gobject.pc.in $(srcdir)/avahi-qt3.pc.in \ + $(srcdir)/avahi-qt4.pc.in $(srcdir)/avahi-ui.pc.in \ + $(srcdir)/common/doxygen.mk $(srcdir)/config.h.in \ + $(top_srcdir)/configure ABOUT-NLS ChangeLog compile \ + config.guess config.rpath config.sub depcomp install-sh \ + ltmain.sh missing py-compile @HAVE_QT3_TRUE@am__append_1 = \ @HAVE_QT3_TRUE@ $(srcdir)/avahi-qt/qt-watch.h @@ -146,30 +156,25 @@ am__aclocal_m4_deps = $(top_srcdir)/common/acx_pthread.m4 \ $(top_srcdir)/common/gcc_stack_protect.m4 \ $(top_srcdir)/common/gcc_visibility.m4 \ - $(top_srcdir)/common/libtool.m4 \ - $(top_srcdir)/common/ltoptions.m4 \ - $(top_srcdir)/common/ltsugar.m4 \ - $(top_srcdir)/common/ltversion.m4 \ - $(top_srcdir)/common/lt~obsolete.m4 \ - $(top_srcdir)/common/nls.m4 $(top_srcdir)/common/python.m4 \ - $(top_srcdir)/acinclude.m4 $(top_srcdir)/common/doxygen.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/common/python.m4 $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/common/doxygen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno config.status.lineno + configure.lineno configure.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = avahi-client.pc avahi-compat-howl.pc \ + avahi-compat-libdns_sd.pc avahi-core.pc avahi-glib.pc \ + avahi-gobject.pc avahi-qt3.pc avahi-qt4.pc avahi-ui.pc SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -179,8 +184,6 @@ am__installdirs = "$(DESTDIR)$(pkgconfigdir)" pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -196,7 +199,8 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -208,8 +212,8 @@ AVAHI_PRIV_ACCESS_GROUP = @AVAHI_PRIV_ACCESS_GROUP@ AVAHI_USER = @AVAHI_USER@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ +BUILD_MANPAGES_FALSE = @BUILD_MANPAGES_FALSE@ +BUILD_MANPAGES_TRUE = @BUILD_MANPAGES_TRUE@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -220,7 +224,6 @@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ DBUS_LIBS = @DBUS_LIBS@ DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@ @@ -228,8 +231,28 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ +DX_COND_chi_FALSE = @DX_COND_chi_FALSE@ +DX_COND_chi_TRUE = @DX_COND_chi_TRUE@ +DX_COND_chm_FALSE = @DX_COND_chm_FALSE@ +DX_COND_chm_TRUE = @DX_COND_chm_TRUE@ +DX_COND_doc_FALSE = @DX_COND_doc_FALSE@ +DX_COND_doc_TRUE = @DX_COND_doc_TRUE@ +DX_COND_dot_FALSE = @DX_COND_dot_FALSE@ +DX_COND_dot_TRUE = @DX_COND_dot_TRUE@ +DX_COND_html_FALSE = @DX_COND_html_FALSE@ +DX_COND_html_TRUE = @DX_COND_html_TRUE@ +DX_COND_latex_FALSE = @DX_COND_latex_FALSE@ +DX_COND_latex_TRUE = @DX_COND_latex_TRUE@ +DX_COND_man_FALSE = @DX_COND_man_FALSE@ +DX_COND_man_TRUE = @DX_COND_man_TRUE@ +DX_COND_pdf_FALSE = @DX_COND_pdf_FALSE@ +DX_COND_pdf_TRUE = @DX_COND_pdf_TRUE@ +DX_COND_ps_FALSE = @DX_COND_ps_FALSE@ +DX_COND_ps_TRUE = @DX_COND_ps_TRUE@ +DX_COND_rtf_FALSE = @DX_COND_rtf_FALSE@ +DX_COND_rtf_TRUE = @DX_COND_rtf_TRUE@ +DX_COND_xml_FALSE = @DX_COND_xml_FALSE@ +DX_COND_xml_TRUE = @DX_COND_xml_TRUE@ DX_CONFIG = @DX_CONFIG@ DX_DOCDIR = @DX_DOCDIR@ DX_DOT = @DX_DOT@ @@ -253,38 +276,85 @@ DX_PDFLATEX = @DX_PDFLATEX@ DX_PERL = @DX_PERL@ DX_PROJECT = @DX_PROJECT@ +ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ENABLE_AUTOIPD_FALSE = @ENABLE_AUTOIPD_FALSE@ +ENABLE_AUTOIPD_TRUE = @ENABLE_AUTOIPD_TRUE@ +ENABLE_CHROOT_FALSE = @ENABLE_CHROOT_FALSE@ +ENABLE_CHROOT_TRUE = @ENABLE_CHROOT_TRUE@ +ENABLE_COMPAT_HOWL_FALSE = @ENABLE_COMPAT_HOWL_FALSE@ +ENABLE_COMPAT_HOWL_TRUE = @ENABLE_COMPAT_HOWL_TRUE@ +ENABLE_COMPAT_LIBDNS_SD_FALSE = @ENABLE_COMPAT_LIBDNS_SD_FALSE@ +ENABLE_COMPAT_LIBDNS_SD_TRUE = @ENABLE_COMPAT_LIBDNS_SD_TRUE@ +ENABLE_CORE_DOCS_FALSE = @ENABLE_CORE_DOCS_FALSE@ +ENABLE_CORE_DOCS_TRUE = @ENABLE_CORE_DOCS_TRUE@ +ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@ +ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@ EXEEXT = @EXEEXT@ -FGREP = @FGREP@ +F77 = @F77@ +FFLAGS = @FFLAGS@ GACUTIL = @GACUTIL@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLADE20_CFLAGS = @GLADE20_CFLAGS@ GLADE20_LIBS = @GLADE20_LIBS@ GLIB20_CFLAGS = @GLIB20_CFLAGS@ GLIB20_LIBS = @GLIB20_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ GOBJECT_LIBS = @GOBJECT_LIBS@ GREP = @GREP@ GTK20_CFLAGS = @GTK20_CFLAGS@ GTK20_LIBS = @GTK20_LIBS@ +HAVE_DBM_FALSE = @HAVE_DBM_FALSE@ +HAVE_DBM_TRUE = @HAVE_DBM_TRUE@ +HAVE_DBUS_FALSE = @HAVE_DBUS_FALSE@ +HAVE_DBUS_TRUE = @HAVE_DBUS_TRUE@ +HAVE_DLOPEN_FALSE = @HAVE_DLOPEN_FALSE@ +HAVE_DLOPEN_TRUE = @HAVE_DLOPEN_TRUE@ +HAVE_GDBM_FALSE = @HAVE_GDBM_FALSE@ +HAVE_GDBM_TRUE = @HAVE_GDBM_TRUE@ +HAVE_GLIB_FALSE = @HAVE_GLIB_FALSE@ +HAVE_GLIB_TRUE = @HAVE_GLIB_TRUE@ +HAVE_GOBJECT_FALSE = @HAVE_GOBJECT_FALSE@ +HAVE_GOBJECT_TRUE = @HAVE_GOBJECT_TRUE@ +HAVE_GTK_FALSE = @HAVE_GTK_FALSE@ +HAVE_GTK_TRUE = @HAVE_GTK_TRUE@ +HAVE_INOTIFY_FALSE = @HAVE_INOTIFY_FALSE@ +HAVE_INOTIFY_TRUE = @HAVE_INOTIFY_TRUE@ +HAVE_KQUEUE_FALSE = @HAVE_KQUEUE_FALSE@ +HAVE_KQUEUE_TRUE = @HAVE_KQUEUE_TRUE@ +HAVE_LIBDAEMON_FALSE = @HAVE_LIBDAEMON_FALSE@ +HAVE_LIBDAEMON_TRUE = @HAVE_LIBDAEMON_TRUE@ +HAVE_MONODOC_FALSE = @HAVE_MONODOC_FALSE@ +HAVE_MONODOC_TRUE = @HAVE_MONODOC_TRUE@ +HAVE_MONO_FALSE = @HAVE_MONO_FALSE@ +HAVE_MONO_TRUE = @HAVE_MONO_TRUE@ +HAVE_NETLINK_FALSE = @HAVE_NETLINK_FALSE@ +HAVE_NETLINK_TRUE = @HAVE_NETLINK_TRUE@ +HAVE_PF_ROUTE_FALSE = @HAVE_PF_ROUTE_FALSE@ +HAVE_PF_ROUTE_TRUE = @HAVE_PF_ROUTE_TRUE@ +HAVE_PYGTK_FALSE = @HAVE_PYGTK_FALSE@ +HAVE_PYGTK_TRUE = @HAVE_PYGTK_TRUE@ +HAVE_PYTHON_DBUS_FALSE = @HAVE_PYTHON_DBUS_FALSE@ +HAVE_PYTHON_DBUS_TRUE = @HAVE_PYTHON_DBUS_TRUE@ +HAVE_PYTHON_FALSE = @HAVE_PYTHON_FALSE@ +HAVE_PYTHON_TRUE = @HAVE_PYTHON_TRUE@ +HAVE_QT3_FALSE = @HAVE_QT3_FALSE@ +HAVE_QT3_TRUE = @HAVE_QT3_TRUE@ +HAVE_QT4_FALSE = @HAVE_QT4_FALSE@ +HAVE_QT4_TRUE = @HAVE_QT4_TRUE@ +HAVE_SYS_FILIO_H_FALSE = @HAVE_SYS_FILIO_H_FALSE@ +HAVE_SYS_FILIO_H_TRUE = @HAVE_SYS_FILIO_H_TRUE@ +HAVE_SYS_SYSCTL_H_FALSE = @HAVE_SYS_SYSCTL_H_FALSE@ +HAVE_SYS_SYSCTL_H_TRUE = @HAVE_SYS_SYSCTL_H_TRUE@ +HAVE_XML_FALSE = @HAVE_XML_FALSE@ +HAVE_XML_TRUE = @HAVE_XML_TRUE@ HOWL_COMPAT_VERSION = @HOWL_COMPAT_VERSION@ -INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -LD = @LD@ LDFLAGS = @LDFLAGS@ LIBAVAHI_CLIENT_VERSION_INFO = @LIBAVAHI_CLIENT_VERSION_INFO@ LIBAVAHI_COMMON_VERSION_INFO = @LIBAVAHI_COMMON_VERSION_INFO@ @@ -301,29 +371,18 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MCS = @MCS@ MDASSEMBLER = @MDASSEMBLER@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MOC_QT3 = @MOC_QT3@ MOC_QT4 = @MOC_QT4@ MONODOCER = @MONODOCER@ MONODOC_CFLAGS = @MONODOC_CFLAGS@ MONODOC_DIR = @MONODOC_DIR@ MONODOC_LIBS = @MONODOC_LIBS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -333,10 +392,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ PTHREAD_CC = @PTHREAD_CC@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LIBS = @PTHREAD_LIBS@ @@ -354,20 +409,42 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -USE_NLS = @USE_NLS@ +TARGET_ARCHLINUX_FALSE = @TARGET_ARCHLINUX_FALSE@ +TARGET_ARCHLINUX_TRUE = @TARGET_ARCHLINUX_TRUE@ +TARGET_DARWIN_FALSE = @TARGET_DARWIN_FALSE@ +TARGET_DARWIN_TRUE = @TARGET_DARWIN_TRUE@ +TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@ +TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@ +TARGET_FEDORA_FALSE = @TARGET_FEDORA_FALSE@ +TARGET_FEDORA_TRUE = @TARGET_FEDORA_TRUE@ +TARGET_FREEBSD_FALSE = @TARGET_FREEBSD_FALSE@ +TARGET_FREEBSD_TRUE = @TARGET_FREEBSD_TRUE@ +TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@ +TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@ +TARGET_LFS_FALSE = @TARGET_LFS_FALSE@ +TARGET_LFS_TRUE = @TARGET_LFS_TRUE@ +TARGET_MANDRIVA_FALSE = @TARGET_MANDRIVA_FALSE@ +TARGET_MANDRIVA_TRUE = @TARGET_MANDRIVA_TRUE@ +TARGET_NETBSD_FALSE = @TARGET_NETBSD_FALSE@ +TARGET_NETBSD_TRUE = @TARGET_NETBSD_TRUE@ +TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@ +TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ +TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ +TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ +USE_XMLTOMAN_FALSE = @USE_XMLTOMAN_FALSE@ +USE_XMLTOMAN_TRUE = @USE_XMLTOMAN_TRUE@ VERSION = @VERSION@ VISIBILITY_HIDDEN_CFLAGS = @VISIBILITY_HIDDEN_CFLAGS@ -XGETTEXT = @XGETTEXT@ XML_CFLAGS = @XML_CFLAGS@ XML_LIBS = @XML_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +ac_ct_F77 = @ac_ct_F77@ acx_pthread_config = @acx_pthread_config@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -382,7 +459,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ -builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -404,7 +480,6 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -418,12 +493,8 @@ pythondir = @pythondir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I common @DX_COND_doc_TRUE@@DX_COND_html_TRUE@DX_CLEAN_HTML = @DX_DOCDIR@/html @DX_COND_chm_TRUE@@DX_COND_doc_TRUE@DX_CLEAN_CHM = @DX_DOCDIR@/chm @@ -576,7 +647,7 @@ config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ + $(MAKE) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -589,6 +660,24 @@ distclean-hdr: -rm -f config.h stamp-h1 +avahi-client.pc: $(top_builddir)/config.status $(srcdir)/avahi-client.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-compat-howl.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-howl.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-compat-libdns_sd.pc: $(top_builddir)/config.status $(srcdir)/avahi-compat-libdns_sd.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-core.pc: $(top_builddir)/config.status $(srcdir)/avahi-core.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-glib.pc: $(top_builddir)/config.status $(srcdir)/avahi-glib.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-gobject.pc: $(top_builddir)/config.status $(srcdir)/avahi-gobject.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-qt3.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt3.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-qt4.pc: $(top_builddir)/config.status $(srcdir)/avahi-qt4.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +avahi-ui.pc: $(top_builddir)/config.status $(srcdir)/avahi-ui.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -597,10 +686,11 @@ -rm -rf .libs _libs distclean-libtool: - -rm -f libtool config.lt + -rm -f libtool +uninstall-info-am: install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -647,7 +737,8 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -691,8 +782,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -717,8 +808,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -728,12 +819,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -748,22 +840,24 @@ distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ + mkdir $(distdir) + $(mkdir_p) $(distdir)/. $(distdir)/avahi-daemon $(distdir)/common $(distdir)/docs $(distdir)/po + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -777,7 +871,7 @@ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -785,8 +879,6 @@ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -797,7 +889,7 @@ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -807,10 +899,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -837,8 +925,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -878,7 +964,7 @@ $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -903,7 +989,7 @@ installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -954,20 +1040,12 @@ install-data-am: install-pkgconfigDATA -install-dvi: install-dvi-recursive - install-exec-am: -install-html: install-html-recursive - install-info: install-info-recursive install-man: -install-pdf: install-pdf-recursive - -install-ps: install-ps-recursive - installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -988,27 +1066,26 @@ ps-am: -uninstall-am: uninstall-pkgconfigDATA +uninstall-am: uninstall-info-am uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-libtool clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-recursive distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-pkgconfigDATA + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-pkgconfigDATA install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-libtool \ + mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ + uninstall-pkgconfigDATA @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps --- a/configure.ac +++ b/configure.ac @@ -1088,6 +1088,15 @@ avahi-autoipd/Makefile avahi-ui/Makefile po/Makefile.in +avahi-client.pc +avahi-compat-howl.pc +avahi-compat-libdns_sd.pc +avahi-core.pc +avahi-glib.pc +avahi-gobject.pc +avahi-qt3.pc +avahi-qt4.pc +avahi-ui.pc ]) AC_OUTPUT