From 5b9db15af1be2fababd89c4f6aa81fa5270f253e Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" <mdryden@chem.utoronto.ca> Date: Tue, 10 Feb 2015 00:20:26 -0500 Subject: [PATCH] Fixed doxyfile and makefile so that source directory isn't deleted on clean. --- DSTAT-temp/Makefile | 4 ++-- DSTAT-temp/doxyfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DSTAT-temp/Makefile b/DSTAT-temp/Makefile index f190753..bd0371d 100644 --- a/DSTAT-temp/Makefile +++ b/DSTAT-temp/Makefile @@ -128,7 +128,7 @@ RM := rm ifeq ($(os),Windows) RMDIR := rmdir /S /Q else -RMDIR := rm -R +RMDIR := rm -df || true endif # On Windows, we need to override the shell to force the use of cmd.exe @@ -476,7 +476,7 @@ doc: .PHONY: cleandoc cleandoc: @$(if $(wildcard $(docdir)),echo $(MSG_CLEAN_DOC)) - $(Q)$(if $(wildcard $(docdir)),$(RM) --recursive $(docdir)) + $(Q)$(if $(wildcard $(docdir)),$(RM) -r $(docdir)) # Rebuild the Doxygen generated documentation. .PHONY: rebuilddoc diff --git a/DSTAT-temp/doxyfile b/DSTAT-temp/doxyfile index efb92c9..e0b0191 100644 --- a/DSTAT-temp/doxyfile +++ b/DSTAT-temp/doxyfile @@ -655,7 +655,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT ="../src" +INPUT ="./src" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is @@ -673,7 +673,7 @@ INPUT_ENCODING = UTF-8 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py # *.f90 *.f *.for *.vhd *.vhdl -FILE_PATTERNS = +FILE_PATTERNS = *.c *.cpp *.h # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. @@ -687,7 +687,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE ="./src/asf" # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded -- GitLab