Fix compilation error caused by ACX_THREAD

[catta] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ec525a38dd4bdcc60e7fda45eda4e9e9141792a1..a9919147f622db7cefdbf92f0009064480ee0032 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,25 @@
-# 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 = \
-       autogen.sh \
-       bootstrap.sh \
        LICENSE \
        $(DX_CONFIG) \
        docs/INSTALL \
@@ -37,39 +35,35 @@ EXTRA_DIST = \
        docs/overview.dia \
        docs/server-states.dia \
        docs/avahi-poll.dia \
-       avahi-core.pc.in \
+       catta.pc.in \
        doxygen_to_devhelp.xsl
 
 SUBDIRS = \
-       common \
-       avahi-common \
-       avahi-core \
+       src \
+    include \
+       tests \
        examples
 
 DX_INPUT = \
-       $(srcdir)/avahi-common/address.h \
-       $(srcdir)/avahi-common/malloc.h \
-       $(srcdir)/avahi-common/strlst.h \
-       $(srcdir)/avahi-common/alternative.h \
-       $(srcdir)/avahi-common/defs.h \
-       $(srcdir)/avahi-common/error.h \
-       $(srcdir)/avahi-common/domain.h \
-       $(srcdir)/avahi-common/watch.h \
-       $(srcdir)/avahi-common/simple-watch.h \
-       $(srcdir)/avahi-common/thread-watch.h
+       $(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
 
-if ENABLE_CORE_DOCS
-DX_INPUT += \
-       $(srcdir)/avahi-core/core.h \
-       $(srcdir)/avahi-core/lookup.h \
-       $(srcdir)/avahi-core/publish.h \
-       $(srcdir)/avahi-core/rr.h \
-       $(srcdir)/avahi-core/log.h
-endif
-
 pkgconfigdir = $(libdir)/pkgconfig
 
 %.pc: %.pc.in
@@ -77,11 +71,11 @@ pkgconfigdir = $(libdir)/pkgconfig
            -e 's,@libdir\@,$(libdir),g' \
            -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
 
-pkgconfig_DATA = avahi-core.pc
-CLEANFILES = avahi-core.pc
-CLEANFILES += avahi.devhelp
+pkgconfig_DATA = catta.pc
+CLEANFILES = catta.pc
+CLEANFILES += catta.devhelp
 
-avahi.devhelp: doxygen-run
+catta.devhelp: doxygen-run
        xsltproc -o $@ doxygen_to_devhelp.xsl doxygen/xml/index.xml
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)