consensus: destroy set handles

[oweals/gnunet.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5ca5666992463bd9799d72b4002e02af4080bf12..567e7b5ff0c24e3dae97631d06ec897983e4e629 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
-INCLUDES = -I$(top_srcdir)/src/include
-SUBDIRS  = contrib doc m4 src po pkgconfig
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+SUBDIRS  = doc m4 src po pkgconfig
+
+if !TALER_ONLY
+  SUBDIRS += contrib
+endif
 
 EXTRA_DIST = \
  ABOUT-NLS \
@@ -10,20 +15,8 @@ EXTRA_DIST = \
 gnunetincludedir = $(includedir)/gnunet
 gnunetinclude_HEADERS = gnunet_config.h
 
-docdir = $(datadir)/doc/
-doc_DATA = COPYING
+docdir = $(datadir)/doc/gnunet/
+doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
 
-ChangeLog:
-       if test -f $(top_srcdir)/.svn/entries; then \
-               svn log -v --xml -r HEAD:18409 | \
-                       xsltproc --stringparam ignore-message-starting "-" \
-                                --stringparam strip-prefix "gnunet" \
-                                --stringparam include-rev "yes" $(top_srcdir)/contrib/svn2cl.xsl - > $@; \
-       fi
-
-dist: ChangeLog
-
-.PHONY: ChangeLog
-