netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH libmnl] build: do not build documentation automatically
@ 2024-10-12 17:15 Pablo Neira Ayuso
  2024-10-12 19:54 ` Phil Sutter
  2024-10-14  7:55 ` Duncan Roe
  0 siblings, 2 replies; 13+ messages in thread
From: Pablo Neira Ayuso @ 2024-10-12 17:15 UTC (permalink / raw)
  To: netfilter-devel

Make it option, after this update it is still possible to build the
documentation on demand via:

 cd doxygen
 make

if ./configure found doxygen. Otherwise, no need to build documentation
when building from source.

Update README to include this information.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 Makefile.am |  2 +-
 README      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 94e6935d6138..6ec1a7b98827 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Make_global.am
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src include examples doxygen
+SUBDIRS = src include examples
 DIST_SUBDIRS = src include examples doxygen
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/README b/README
index 317a2c6ad1d6..c82dedd2266a 100644
--- a/README
+++ b/README
@@ -23,6 +23,16 @@ forced to use them.
 You can find several example files under examples/ that you can compile by
 invoking `make check'.
 
+= Documentation =
+
+If ./configure reports that doxygen has been found, then you can build
+documentation through:
+
+	cd doxygen
+	make
+
+then, open doxygen/html/index.html in your browser.
+
 = Contributing =
 
 Please submit any patches to <netfilter-devel@vger.kernel.org>.
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH libmnl,v2] build: do not build documentation automatically
@ 2024-10-13 19:41 Pablo Neira Ayuso
  2024-10-14  9:04 ` Phil Sutter
  0 siblings, 1 reply; 13+ messages in thread
From: Pablo Neira Ayuso @ 2024-10-13 19:41 UTC (permalink / raw)
  To: netfilter-devel; +Cc: phil

Make it optional. After this update it is still possible to build the
documentation via:

	./configure --with-doxygen=yes

if ./configure finds doxygen. Update README to include this information.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 README       | 11 +++++++++++
 configure.ac |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 317a2c6ad1d6..4a2ccab00647 100644
--- a/README
+++ b/README
@@ -18,6 +18,17 @@ on top of this library.
 is reduced, i.e. the library provides many helpers, but the programmer is not
 forced to use them.
 
+= Documentation =
+
+If doxygen is installed on your system, you can enable it via:
+
+       ./configure --with-doxygen=yes
+
+then type `make`.
+
+To access the doxygen documentation, open the doxygen/html/index.html file with
+a web browser.
+
 = Example files =
 
 You can find several example files under examples/ that you can compile by
diff --git a/configure.ac b/configure.ac
index 4698aec055b7..9305766f6390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_CONFIG_FILES([Makefile
 
 AC_ARG_WITH([doxygen], [AS_HELP_STRING([--with-doxygen],
 	    [create doxygen documentation])],
-	    [with_doxygen="$withval"], [with_doxygen=yes])
+	    [with_doxygen="$withval"], [with_doxygen=no])
 
 AS_IF([test "x$with_doxygen" != xno], [
 	AC_CHECK_PROGS([DOXYGEN], [doxygen])
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-10-17 23:59 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-12 17:15 [PATCH libmnl] build: do not build documentation automatically Pablo Neira Ayuso
2024-10-12 19:54 ` Phil Sutter
2024-10-12 21:26   ` Pablo Neira Ayuso
2024-10-12 23:03     ` Phil Sutter
2024-10-13  8:21       ` Pablo Neira Ayuso
2024-10-14  7:55 ` Duncan Roe
2024-10-14  8:09   ` Pablo Neira Ayuso
2024-10-14 11:12     ` Jan Engelhardt
2024-10-14 11:20       ` Pablo Neira Ayuso
     [not found]         ` <Zw8UOCbpwSOupUcf@slk15.local.net>
     [not found]           ` <Zw9qbppRAtX4VbIv@calendula>
2024-10-16  7:26             ` [PATCH libmnl v2] " Pablo Neira Ayuso
2024-10-17 23:59               ` Duncan Roe
  -- strict thread matches above, loose matches on Subject: below --
2024-10-13 19:41 [PATCH libmnl,v2] " Pablo Neira Ayuso
2024-10-14  9:04 ` Phil Sutter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).