Index: Makefile =================================================================== RCS file: /usr/cvsroot/asterisk/Makefile,v retrieving revision 1.223 diff -u -r1.223 Makefile --- Makefile 8 Nov 2005 03:31:45 -0000 1.223 +++ Makefile 14 Nov 2005 13:15:55 -0000 @@ -392,6 +392,12 @@ CFLAGS+=$(ASTCFLAGS) endif +ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) + HAVEDOT=yes +else + HAVEDOT=no +endif + LIBS+=-lssl INSTALL=install @@ -826,7 +832,8 @@ rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec progdocs: - doxygen contrib/asterisk-ng-doxygen + (cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT) \ + PROJECT_NUMBER=$(ASTERISKVERSION) - $(ASTERISKVERSIONNUM)") | doxygen - mpg123: @wget -V >/dev/null || (echo "You need wget" ; false ) Index: contrib/asterisk-ng-doxygen =================================================================== RCS file: /usr/cvsroot/asterisk/contrib/asterisk-ng-doxygen,v retrieving revision 1.8 diff -u -r1.8 asterisk-ng-doxygen --- contrib/asterisk-ng-doxygen 25 Oct 2005 13:19:12 -0000 1.8 +++ contrib/asterisk-ng-doxygen 14 Nov 2005 13:15:58 -0000 @@ -19,11 +19,6 @@ PROJECT_NAME = "Asterisk - the Open Source PBX" -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = CVS_HEAD # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -455,6 +450,7 @@ include/asterisk \ channels \ funcs \ + stdtime \ apps \ cdr \ codecs \ @@ -716,7 +712,7 @@ # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are # probably better off using the HTML help feature. -GENERATE_TREEVIEW = NO +GENERATE_TREEVIEW = YES # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be # used to set the initial width (in pixels) of the frame in which the tree @@ -1083,7 +1079,8 @@ # toolkit from AT&T and Lucent Bell Labs. The other options in this section # have no effect if this option is set to NO (the default) -HAVE_DOT = YES +#Created by Asterisk Makefile +#HAVE_DOT = NO # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and