@@ -15,7 +15,6 @@ Makefile.in
/libtool
/stamp-h1
-/doxygen.cfg
/libmnl.pc
/libmnl-*.tar.bz2
@@ -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])],
@@ -1,3 +1,4 @@
doxyfile.stamp
+doxygen.cfg
html/
man/
@@ -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
similarity index 95%
rename from doxygen.cfg.in
rename to 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
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> --- .gitignore | 1 - configure.ac | 15 ++++++++++++++- doxygen/.gitignore | 1 + doxygen/Makefile.am | 2 +- doxygen.cfg.in => doxygen/doxygen.cfg.in | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) rename doxygen.cfg.in => doxygen/doxygen.cfg.in (95%)