[GNUnet-SVN] [gnurl] 86/208: make: build the docs subdir only from within src

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit d24838d4da9faadee5fa954bbcee7a75bb43d12b
Author: Daniel Stenberg <address@hidden>
AuthorDate: Fri Jun 30 16:42:26 2017 +0200

    make: build the docs subdir only from within src
    
    ... and don't build at all in include
    
    Prompted-by-work-by: Simon Warta
    Ref: #1590
    Closes #1591
---
 Makefile.am      | 4 ++--
 docs/Makefile.am | 4 ++--
 src/Makefile.am  | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dc66067cf..64c1ca200 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,8 +154,8 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) 
$(VC7_SRCVCPROJ)  \
 
 bin_SCRIPTS = curl-config
 
-SUBDIRS = lib docs src include
-DIST_SUBDIRS = $(SUBDIRS) tests packages scripts
+SUBDIRS = lib src
+DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcurl.pc
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 21c1be048..086b8c15f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -35,8 +35,8 @@ HTMLPAGES = $(GENHTMLPAGES) index.html
 
 # Build targets in this file (.) before cmdline-opts to ensure that
 # the curl.1 rule below runs first
-SUBDIRS = libcurl . cmdline-opts
-DIST_SUBDIRS = $(SUBDIRS) examples
+SUBDIRS = . cmdline-opts
+DIST_SUBDIRS = $(SUBDIRS) examples libcurl
 
 CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) curl.1
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b4835953..861668467 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
 
 bin_PROGRAMS = curl
 
+SUBDIRS = ../docs
+
 if USE_CPPFLAG_CURL_STATICLIB
 AM_CPPFLAGS += -DCURL_STATICLIB
 endif
@@ -81,7 +83,6 @@ libcurltool_la_LDFLAGS = -static $(LINKFLAGS)
 libcurltool_la_SOURCES = $(curl_SOURCES)
 endif
 
-BUILT_SOURCES = tool_hugehelp.c
 CLEANFILES = tool_hugehelp.c
 # Use the C locale to ensure that only ASCII characters appear in the
 # embedded text.
@@ -101,9 +102,6 @@ HUGE=tool_hugehelp.c
 if USE_MANUAL
 # Here are the stuff to create a built-in manual
 
-$(MANPAGE):
-       cd $(top_builddir)/docs && $(MAKE)
-
 if HAVE_LIBZ
 # This generates the tool_hugehelp.c file in both uncompressed and
 # compressed formats.

-- 
To stop receiving notification emails like this one, please contact
address@hidden