gnunet-arm -s is required as normal user too

[oweals/gnunet.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 18638d78e3f188a1231a0d7bdafea8fdc6956d77..d69dd3a8232abe8dc00a7d167785407572a66e70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,25 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS  = doc m4 src po pkgconfig
+
+# only documentation (ALL of the documentation)
+if DOCUMENTATION_ONLY
+  SUBDIRS = doc
+else
+  SUBDIRS = m4 src po pkgconfig
+endif
+
+# documentation on / off switch (affects all of the documentation)
+if DOCUMENTATION
+  SUBDIRS += doc
+endif
+if HAVE_EXPERIMENTAL
+  SUBDIRS += lint
+endif
+
+# only manpages, needs "doc" subdir
+if INCLUDE_MANPAGES
+  SUBDIRS += doc
+endif
 
 if !TALER_ONLY
   SUBDIRS += contrib
@@ -9,8 +28,8 @@ endif
 EXTRA_DIST = \
  ABOUT-NLS \
  config.rpath \
- install-sh \
- acinclude.m4
+ acinclude.m4 \
+ README.1st
 
 gnunetincludedir = $(includedir)/gnunet
 gnunetinclude_HEADERS = gnunet_config.h
@@ -19,16 +38,3 @@ docdir = $(datadir)/doc/gnunet/
 doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
-
-ChangeLog:
-       if svn info > /dev/null; 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
-