kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

doc: Make progdocs play nice with git

Browse Source 
Moved contrib/asterisk-ng-doxygen to doc/asterisk-ng-doxygen.in

Changed /Makefile to copy asterisk-ng-doxygen.in to
asterisk-ng-doxygen then modify it with version instead of
modifying asterisk-ng-doxygen directly.  Updated clean
targets as well.

Updated /.gitignore and doc/.gitignore.

Change-Id: I38712d3e334fa4baec19d30d05de8c6f28137622
This commit is contained in:
George Joseph
2015-05-07 13:54:35 -06:00
parent 009b44172d
commit cf637f2510
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -31,3 +31,6 @@ menuselect-tree
*.pyc *.pyc
*.gcno *.gcno
*.gcda *.gcda
latex
doxygen.log

18
Makefile
View File

@@ -429,6 +429,8 @@ _clean:
rm -f doc/core-en_US.xml rm -f doc/core-en_US.xml
rm -f doc/full-en_US.xml rm -f doc/full-en_US.xml
rm -f doc/rest-api/*.wiki rm -f doc/rest-api/*.wiki
rm -f doxygen.log
rm -rf latex
rm -f rest-api-templates/*.pyc rm -f rest-api-templates/*.pyc
@$(MAKE) -C menuselect clean @$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean cp -f .cleancount .lastclean
@@ -445,6 +447,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
rm -f include/asterisk/autoconfig.h rm -f include/asterisk/autoconfig.h
rm -f include/asterisk/buildopts.h rm -f include/asterisk/buildopts.h
rm -rf doc/api rm -rf doc/api
rm -f doc/asterisk-ng-doxygen
rm -f build_tools/menuselect-deps rm -f build_tools/menuselect-deps
datafiles: _all doc/core-en_US.xml datafiles: _all doc/core-en_US.xml
@@ -763,7 +766,8 @@ webvmail:
@echo " +-------------------------------------------+" @echo " +-------------------------------------------+"
progdocs: progdocs:
# Note, Makefile conditionals must not be tabbed out. Wasted hours with that. # Note, Makefile conditionals must not be tabbed out. Wasted hours with that.
@cp doc/asterisk-ng-doxygen.in doc/asterisk-ng-doxygen
ifeq ($(DOXYGEN),:) ifeq ($(DOXYGEN),:)
@echo "Doxygen is not installed. Please install and re-run the configuration script." @echo "Doxygen is not installed. Please install and re-run the configuration script."
else else
@@ -771,20 +775,20 @@ ifeq ($(DOT),:)
@echo "DOT is not installed. Doxygen will not produce any diagrams. Please install and re-run the configuration script." @echo "DOT is not installed. Doxygen will not produce any diagrams. Please install and re-run the configuration script."
else else
# Enable DOT # Enable DOT
@echo "HAVE_DOT = YES" >> contrib/asterisk-ng-doxygen @echo "HAVE_DOT = YES" >> doc/asterisk-ng-doxygen
endif endif
# Set Doxygen PROJECT_NUMBER variable # Set Doxygen PROJECT_NUMBER variable
ifneq ($(ASTERISKVERSION),UNKNOWN__and_probably_unsupported) ifneq ($(ASTERISKVERSION),UNKNOWN__and_probably_unsupported)
@echo "PROJECT_NUMBER = $(ASTERISKVERSION)" >> contrib/asterisk-ng-doxygen @echo "PROJECT_NUMBER = $(ASTERISKVERSION)" >> doc/asterisk-ng-doxygen
else else
echo "Asterisk Version is unknown, not configuring Doxygen PROJECT_NUMBER." echo "Asterisk Version is unknown, not configuring Doxygen PROJECT_NUMBER."
endif endif
# Validate Doxygen Configuration # Validate and auto-update local copy
@doxygen -u contrib/asterisk-ng-doxygen @doxygen -u doc/asterisk-ng-doxygen
# Run Doxygen # Run Doxygen
@doxygen contrib/asterisk-ng-doxygen @doxygen doc/asterisk-ng-doxygen
# Remove configuration backup file # Remove configuration backup file
@rm -f contrib/asterisk-ng-doxygen.bak @rm -f doc/asterisk-ng-doxygen.bak
endif endif
install-logrotate: install-logrotate:

4
doc/.gitignore vendored
View File

@@ -1,2 +1,4 @@
core-en_US.xml core-en_US.xml
rest-api rest-api
api
asterisk-ng-doxygen

0
contrib/asterisk-ng-doxygen → doc/asterisk-ng-doxygen.in
View File