diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-06-26 12:18:56 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-06-26 12:18:56 +0200 |
| commit | c49269967aecaa4635183ebc91f56edebc10922d (patch) | |
| tree | 0c45c2d48349cfea2c133bd1c171305057e9f3b4 | |
| parent | 64ed44a815e4ee158ea1c0a57a714f0d501ad109 (diff) | |
| download | curl-c49269967aecaa4635183ebc91f56edebc10922d.tar.gz | |
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
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | docs/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 6 insertions, 4 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..e98e4d16e 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 |