diff options
| author | Duncan Roe <duncan_roe@optusnet.com.au> | 2021-08-28 13:35:05 +1000 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-08-28 11:13:12 +0200 |
| commit | c12749e373df182c343caa314b9578e617e98f4d (patch) | |
| tree | 28581db400ebc2fdd11d13643cba909022bf72b0 | |
| parent | 04d1e65f8d9381cec0ce2e02037a62f30fd4f15f (diff) | |
build: doc: Avoid having to special-case `make distcheck`
- Move doxygen.cfg.in to doxygen/
- Tell doxygen.cfg.in where the sources are
- Let doxygen.cfg.in default its output to CWD
- In Makefile, `doxygen doxygen.cfg` "just works"
Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | doxygen/Makefile.am | 12 | ||||
| -rw-r--r-- | doxygen/doxygen.cfg.in (renamed from doxygen.cfg.in) | 3 |
3 files changed, 4 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 0fe754c..4721eeb 100644 --- a/configure.ac +++ b/configure.ac @@ -31,9 +31,9 @@ PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3]) dnl Output the makefiles AC_CONFIG_FILES([Makefile src/Makefile utils/Makefile examples/Makefile - libnetfilter_queue.pc doxygen.cfg + libnetfilter_queue.pc include/Makefile include/libnetfilter_queue/Makefile - doxygen/Makefile + doxygen/Makefile doxygen/doxygen.cfg include/linux/Makefile include/linux/netfilter/Makefile]) AC_ARG_WITH([doxygen], [AS_HELP_STRING([--with-doxygen], diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am index 5068544..f38009b 100644 --- a/doxygen/Makefile.am +++ b/doxygen/Makefile.am @@ -4,17 +4,7 @@ doc_srcs = $(shell find $(top_srcdir)/src -name '*.c') doxyfile.stamp: $(doc_srcs) Makefile.am rm -rf html man - -# Test for running under make distcheck. -# If so, sibling src directory will be empty: -# move it out of the way and symlink the real one while we run doxygen. - [ -f ../src/Makefile.in ] || \ -{ set -x; cd ..; mv src src.distcheck; ln -s $(top_srcdir)/src; } - - cd ..; doxygen doxygen.cfg >/dev/null - - [ ! -d ../src.distcheck ] || \ -{ set -x; cd ..; rm src; mv src.distcheck src; } + doxygen doxygen.cfg >/dev/null $(abs_top_srcdir)/doxygen/build_man.sh diff --git a/doxygen.cfg.in b/doxygen/doxygen.cfg.in index 266782e..99b5c90 100644 --- a/doxygen.cfg.in +++ b/doxygen/doxygen.cfg.in @@ -1,12 +1,11 @@ # Difference with default Doxyfile 1.8.20 PROJECT_NAME = @PACKAGE@ PROJECT_NUMBER = @VERSION@ -OUTPUT_DIRECTORY = doxygen ABBREVIATE_BRIEF = FULL_PATH_NAMES = NO TAB_SIZE = 8 OPTIMIZE_OUTPUT_FOR_C = YES -INPUT = . +INPUT = @abs_top_srcdir@/src FILE_PATTERNS = *.c RECURSIVE = YES EXCLUDE_SYMBOLS = EXPORT_SYMBOL \ |