diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2022-08-03 21:12:45 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2022-09-21 10:35:32 +0200 |
| commit | cd533815917043584546a6d1a4da6f163a56ad3e (patch) | |
| tree | 94d52cb1284ac9c5521ef36d4406602ec0fbe0e7 | |
| parent | 23a2298ecf2defa1ad476ab217a5ea4438c3c781 (diff) | |
| download | libmnl-cd533815917043584546a6d1a4da6f163a56ad3e.tar.gz | |
doc: move doxygen config file into doxygen directory
Now that the `INPUT` directory is correct, we can update `OUTPUT_DIRECTORY` to
`.` and we don't need to cd out of the doxygen directory to run doxygen.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | doxygen/.gitignore | 1 | ||||
| -rw-r--r-- | doxygen/Makefile.am | 2 | ||||
| -rw-r--r-- | doxygen/doxygen.cfg.in (renamed from doxygen.cfg.in) | 2 |
5 files changed, 17 insertions, 4 deletions
@@ -15,7 +15,6 @@ Makefile.in /libtool /stamp-h1 -/doxygen.cfg /libmnl.pc /libmnl-*.tar.bz2 diff --git a/configure.ac b/configure.ac index 314481d..dcdd424 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,20 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wformat=2 -pipe" AC_SUBST([regular_CPPFLAGS]) AC_SUBST([regular_CFLAGS]) -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile examples/genl/Makefile examples/kobject/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg doxygen/Makefile]) +AC_CONFIG_FILES([Makefile + src/Makefile + include/Makefile + include/libmnl/Makefile + include/linux/Makefile + include/linux/netfilter/Makefile + examples/Makefile + examples/genl/Makefile + examples/kobject/Makefile + examples/netfilter/Makefile + examples/rtnl/Makefile + libmnl.pc + doxygen/doxygen.cfg + doxygen/Makefile]) AC_ARG_WITH([doxygen], [AS_HELP_STRING([--with-doxygen], [create doxygen documentation])], diff --git a/doxygen/.gitignore b/doxygen/.gitignore index a23345c..2196cf8 100644 --- a/doxygen/.gitignore +++ b/doxygen/.gitignore @@ -1,3 +1,4 @@ doxyfile.stamp +doxygen.cfg html/ man/ diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am index 09124ea..e4fc0eb 100644 --- a/doxygen/Makefile.am +++ b/doxygen/Makefile.am @@ -4,7 +4,7 @@ doc_srcs = $(shell find $(top_srcdir)/src -name '*.c') doxyfile.stamp: $(doc_srcs) Makefile.am rm -rf html man - cd ..; doxygen doxygen.cfg >/dev/null + doxygen doxygen.cfg >/dev/null # We need to use bash for its associative array facility # (`bash -p` prevents import of functions from the environment). # The command has to be a single line so the functions work diff --git a/doxygen.cfg.in b/doxygen/doxygen.cfg.in index d6db004..24089ac 100644 --- a/doxygen.cfg.in +++ b/doxygen/doxygen.cfg.in @@ -1,7 +1,7 @@ # Difference with default Doxyfile 1.8.20 PROJECT_NAME = @PACKAGE@ PROJECT_NUMBER = @VERSION@ -OUTPUT_DIRECTORY = doxygen +OUTPUT_DIRECTORY = . ABBREVIATE_BRIEF = FULL_PATH_NAMES = NO TAB_SIZE = 8 |