From 6ad90be1df339da1ae65328c738d60e142b13efe Mon Sep 17 00:00:00 2001 From: Perry Ismangil Date: Tue, 19 Jul 2011 21:42:58 +0000 Subject: Re #1254 Doxygen configuration and makefile changes to support version specific documentation git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3669 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/build/Makefile | 14 +++++++++----- pjlib/docs/doxygen.cfg | 4 ++-- pjlib/docs/header.html | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'pjlib') diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 6e95003e..91836445 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -1,4 +1,5 @@ include ../../build.mak +include ../../version.mak include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak @@ -57,12 +58,15 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT all: $(TARGETS) doc: - cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg - @if [ -n "$(WWWDIR)" ]; then \ - echo "Copying to $(WWWDIR)/pjlib/docs/html.." ; \ - cp -a ../docs/html/* $(WWWDIR)/pjlib/docs/html/ ; \ + cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg + @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ + echo "Creating docs/$(PJ_VERSION)/pjlib/docs/html" ; \ + mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html ; \ + fi + @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ + echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html.." ; \ + cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html/ ; \ fi - print: $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib print_lib $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test print_bin diff --git a/pjlib/docs/doxygen.cfg b/pjlib/docs/doxygen.cfg index 6b6a8d3e..88a032d8 100644 --- a/pjlib/docs/doxygen.cfg +++ b/pjlib/docs/doxygen.cfg @@ -23,14 +23,14 @@ PROJECT_NAME = "PJLIB Reference" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = +PROJECT_NUMBER = $(PJ_VERSION) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = docs +OUTPUT_DIRECTORY = docs/$(PJ_VERSION) # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this diff --git a/pjlib/docs/header.html b/pjlib/docs/header.html index 5517dc34..60db3f71 100644 --- a/pjlib/docs/header.html +++ b/pjlib/docs/header.html @@ -1,6 +1,6 @@ -$title +$title ($projectnumber) -- cgit v1.2.3