Commit 4c49b835 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

docs/curl.1: generate from the cmdline-opts script

parent fd3ca89c

docs/Makefile.am

+5 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -31,7 +31,7 @@ HTMLPAGES = $(GENHTMLPAGES) index.html 


SUBDIRS = examples libcurl cmdline-opts



CLEANFILES = $(GENHTMLPAGES) $(PDFPAGES)

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



EXTRA_DIST = MANUAL BUGS CONTRIBUTE.md FAQ FEATURES INTERNALS.md SSLCERTS.md  \

 README.win32 RESOURCES TODO TheArtOfHttpScripting THANKS VERSIONS KNOWN_BUGS \
@@ -44,6 +44,9 @@ MAN2HTML= roffit $< >$@ 


SUFFIXES = .1 .html .pdf



curl.1:

	cd cmdline-opts && make



html: $(HTMLPAGES)

	cd libcurl && make html

docs/cmdline-opts/Makefile.am

+12 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -22,8 +22,9 @@ 


AUTOMAKE_OPTIONS = foreign no-dependencies



DPAGES = abstract-unix-socket.d anyauth.d 				\

  append.d basic.d cacert.d capath.d cert.d				\

MANPAGE = $(top_builddir)/docs/curl.1



DPAGES = abstract-unix-socket.d anyauth.d append.d basic.d cacert.d capath.d cert.d \

  cert-status.d cert-type.d ciphers.d compressed.d config.d		\

  connect-timeout.d connect-to.d continue-at.d cookie.d cookie-jar.d	\

  create-dirs.d crlf.d crlfile.d data-ascii.d data-binary.d data.d	\
@@ -65,4 +66,11 @@ DPAGES = abstract-unix-socket.d anyauth.d \ 
  unix-socket.d upload-file.d url.d use-ascii.d user-agent.d user.d	\

  verbose.d version.d write-out.d xattr.d



EXTRA_DIST = $(DPAGES) MANPAGE.md gen.pl page-footer page-header
 
OTHERPAGES = page-footer page-header



EXTRA_DIST = $(DPAGES) MANPAGE.md gen.pl $(OTHERPAGES)



all: $(MANPAGE)



$(MANPAGE): $(DPAGES) $(OTHERPAGES)

	@PERL@ gen.pl mainpage > $(MANPAGE)

docs/curl.1

deleted100644 → 0
+0 −2697

File deleted.

Preview size limit exceeded, changes collapsed.

src/Makefile.am

+4 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#                            | (__| |_| |  _ <| |___

#                             \___|\___/|_| \_\_____|

#

# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.

# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

#

# This software is licensed as described in the file COPYING, which

# you should have received as part of this distribution. The terms
@@ -101,6 +101,9 @@ HUGE=tool_hugehelp.c 
if USE_MANUAL

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



$(MANPAGE):

	cd $(top_builddir)/docs && make curl.1



if HAVE_LIBZ

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

# compressed formats