Commit d24838d4 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent 0362c778

Makefile.am

+2 −2
Original line number Original line Diff line number Diff line
@@ -154,8 +154,8 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ 




bin_SCRIPTS = curl-config

bin_SCRIPTS = curl-config





SUBDIRS = lib docs src include

SUBDIRS = lib src

DIST_SUBDIRS = $(SUBDIRS) tests packages scripts

DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs





pkgconfigdir = $(libdir)/pkgconfig

pkgconfigdir = $(libdir)/pkgconfig

pkgconfig_DATA = libcurl.pc

pkgconfig_DATA = libcurl.pc

docs/Makefile.am

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,8 +35,8 @@ HTMLPAGES = $(GENHTMLPAGES) index.html 




# Build targets in this file (.) before cmdline-opts to ensure that

# Build targets in this file (.) before cmdline-opts to ensure that

# the curl.1 rule below runs first

# the curl.1 rule below runs first

SUBDIRS = libcurl . cmdline-opts

SUBDIRS = . cmdline-opts

DIST_SUBDIRS = $(SUBDIRS) examples

DIST_SUBDIRS = $(SUBDIRS) examples libcurl





CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) curl.1

CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES) $(MANDISTPAGES) curl.1

src/Makefile.am

+2 −4
Original line number Original line Diff line number Diff line
@@ -43,6 +43,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include \ 




bin_PROGRAMS = curl

bin_PROGRAMS = curl





SUBDIRS = ../docs



if USE_CPPFLAG_CURL_STATICLIB

if USE_CPPFLAG_CURL_STATICLIB

AM_CPPFLAGS += -DCURL_STATICLIB

AM_CPPFLAGS += -DCURL_STATICLIB

endif

endif
@@ -81,7 +83,6 @@ libcurltool_la_LDFLAGS = -static $(LINKFLAGS) 
libcurltool_la_SOURCES = $(curl_SOURCES)

libcurltool_la_SOURCES = $(curl_SOURCES)

endif

endif





BUILT_SOURCES = tool_hugehelp.c

CLEANFILES = tool_hugehelp.c

CLEANFILES = tool_hugehelp.c

# Use the C locale to ensure that only ASCII characters appear in the

# Use the C locale to ensure that only ASCII characters appear in the

# embedded text.

# embedded text.
@@ -101,9 +102,6 @@ HUGE=tool_hugehelp.c 
if USE_MANUAL

if USE_MANUAL

# Here are the stuff to create a built-in manual

# Here are the stuff to create a built-in manual





$(MANPAGE):

	cd $(top_builddir)/docs && $(MAKE)



if HAVE_LIBZ

if HAVE_LIBZ

# This generates the tool_hugehelp.c file in both uncompressed and

# This generates the tool_hugehelp.c file in both uncompressed and

# compressed formats.

# compressed formats.