Merge remote-tracking branch 'origin/identity_abe'

[oweals/gnunet.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 39a37a9402d345ced0dcd3887ffa21c07d7055b7..7fae33e0f3fab47c52c446cc5e382454d2b24b53 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,22 @@
-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
+
+if DOC_ONLY
+  SUBDIRS = doc m4 po pkgconfig
+else
+  SUBDIRS  = doc m4 src po pkgconfig
+endif
+
+if !TALER_ONLY
+  SUBDIRS += contrib
+endif
 
 EXTRA_DIST = \
  ABOUT-NLS \
  config.rpath \
  install-sh \
- acinclude.m4
+ acinclude.m4 \
+ README.1st
 
 gnunetincludedir = $(includedir)/gnunet
 gnunetinclude_HEADERS = gnunet_config.h
@@ -15,15 +26,3 @@ 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
-