Everywhere: Merge V_1_1_29_40_POST_ACCEPTANCE

This commit is contained in:
Jan Lindemann 2011-02-20 14:15:22 +00:00 committed by Jan Lindemann
commit 2939f8e3a8
29 changed files with 743 additions and 125 deletions

View file

@ -22,6 +22,13 @@ INSTALL_DOXYGEN_DIR ?= $(DOC_PREFIX)/devel
DOC_FILES = $(IMAGEDIR)/jannet_08.png
DOXYGEN_CONF ?= doxygen.conf
# replaced pattern defaults
DOC_FILE_PATTERNS ?= *.h
DOC_INPUT_DIRS ?= $(TOPDIR)/include
DOC_SRC_IS_JAVA ?= NO
DOC_EXCLUDE_FILES ?=
DOC_INCLUDE_PATH ?=
all: html
install: install.done
distclean: clean
@ -34,11 +41,16 @@ html: doxygen.done cpfiles.done
%: %.tmpl
cat $< \
| sed "s/__VERSION__/$(VERSION)/" \
| sed "s/__VERSION__/$(DIST_VERSION)/" \
| sed "s/__PROJECT__/$(PROJECT)/" \
| sed "s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/" \
| sed "s/__OUTPUT_DIR__/$(OUTPUT_DIR)/" \
| sed "s%__PROJECT_TOPDIR__%$(TOPDIR)%" \
| sed "s%__FILE_PATTERNS__%$(DOC_FILE_PATTERNS)%" \
| sed "s%__INPUT_DIRS__%$(DOC_INPUT_DIRS)%" \
| sed "s%__SRC_IS_JAVA__%$(DOC_SRC_IS_JAVA)%" \
| sed "s%__EXCLUDE_FILES__%$(DOC_EXCLUDE_FILES)%" \
| sed "s%__INCLUDE_PATH__%$(DOC_INCLUDE_PATH)%" \
> $@
doxygen.done: $(UNTEMPLATED)