Fix compilation error caused by ACX_THREAD

[catta] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e23db8e97d97f899ae1ef66f65b161094fb18c4a..a9919147f622db7cefdbf92f0009064480ee0032 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,59 +1,81 @@
-# $Id$
-
-# This file is part of avahi.
+# This file is part of catta.
 #
-# avahi is free software; you can redistribute it and/or modify it
+# catta is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
 # License, or (at your option) any later version.
 #
-# avahi is distributed in the hope that it will be useful, but WITHOUT
+# catta is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
 # License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
-# License along with avahi; if not, write to the Free Software
+# License along with catta; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-ACLOCAL_AMFLAGS = -I common
+ACLOCAL_AMFLAGS = -I m4
 
-include $(srcdir)/common/doxygen.mk
+include $(srcdir)/m4/doxygen.mk
 
 EXTRA_DIST = \
-       bootstrap.sh \
        LICENSE \
        $(DX_CONFIG) \
        docs/INSTALL \
        docs/TODO \
+       docs/NEWS \
        docs/README \
        docs/DBUS-API \
        docs/AUTHORS \
        docs/HACKING \
-       docs/overview.dia
+       docs/API-CHANGES-0.6 \
+       docs/COMPAT-LAYERS \
+       docs/MALLOC \
+       docs/overview.dia \
+       docs/server-states.dia \
+       docs/avahi-poll.dia \
+       catta.pc.in \
+       doxygen_to_devhelp.xsl
 
 SUBDIRS = \
-       common \
-       avahi-common \
-       avahi-glib \
-       avahi-core \
-       avahi-discover-standalone \
-       avahi-client \
-       avahi-daemon \
-       initscript \
-       avahi-dnsconfd \
-       avahi-utils \
-       examples \
-       man \
-       tests
+       src \
+    include \
+       tests \
+       examples
+
+DX_INPUT = \
+       $(srcdir)/include/catta/address.h \
+       $(srcdir)/include/catta/malloc.h \
+       $(srcdir)/include/catta/strlst.h \
+       $(srcdir)/include/catta/alternative.h \
+       $(srcdir)/include/catta/defs.h \
+       $(srcdir)/include/catta/error.h \
+       $(srcdir)/include/catta/domain.h \
+       $(srcdir)/include/catta/watch.h \
+       $(srcdir)/include/catta/simple-watch.h \
+       $(srcdir)/include/catta/thread-watch.h \
+       $(srcdir)/include/catta/core.h \
+       $(srcdir)/include/catta/lookup.h \
+       $(srcdir)/include/catta/publish.h \
+       $(srcdir)/include/catta/rr.h \
+       $(srcdir)/include/catta/log.h
+
+DX_EXAMPLE_PATH = $(srcdir)/examples
+DX_EXAMPLE_PATTERNS = *.c
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = avahi-core.pc
 
-MOSTLYCLEANFILES = $(DX_CLEANFILES)
+%.pc: %.pc.in
+       $(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
+           -e 's,@libdir\@,$(libdir),g' \
+           -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
-homepage:
-       scp avahi-daemon/*.introspect avahi-daemon/introspect.dtd avahi-daemon/introspect.xsl\
-           man/*.xml man/xmltoman.dtd man/xmltoman.xsl \
-           fdo:public_html/
+pkgconfig_DATA = catta.pc
+CLEANFILES = catta.pc
+CLEANFILES += catta.devhelp
+
+catta.devhelp: doxygen-run
+       xsltproc -o $@ doxygen_to_devhelp.xsl doxygen/xml/index.xml
+
+MOSTLYCLEANFILES = $(DX_CLEANFILES)