Changeset 3669
- Timestamp:
- Jul 19, 2011 9:42:58 PM (13 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/Makefile
r3351 r3669 2 2 include build/host-$(HOST_NAME).mak 3 3 -include user.mak 4 include version.mak 4 5 5 6 DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build pjsip-apps/build $(EXTRA_DIRS) … … 24 25 fi 25 26 for dir in $(DIRS); do \ 26 if $(MAKE) $(MAKE_FLAGS) -C $$dir /build$@; then \27 if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \ 27 28 true; \ 28 29 else \ … … 93 94 94 95 prefix = $(ac_prefix) 95 include version.mak96 96 97 97 install: -
pjproject/trunk/pjlib-util/build/Makefile
r3319 r3669 4 4 5 5 include ../../build.mak 6 include ../../version.mak 6 7 include $(PJDIR)/build/common.mak 7 8 … … 56 57 57 58 doc: 58 cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 59 @if [ -n "$(WWWDIR)" ]; then \ 60 echo "Copying to $(WWWDIR)/pjlib-util/docs/html.." ; \ 61 cp -a ../docs/html/* $(WWWDIR)/pjlib-util/docs/html/ ; \ 59 cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 60 @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html" ] ; then \ 61 echo "Creating docs/$(PJ_VERSION)/pjlib-util/docs/html" ; \ 62 mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html ; \ 63 fi 64 @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html" ] ; then \ 65 echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html.." ; \ 66 cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html/ ; \ 62 67 fi 63 68 -
pjproject/trunk/pjlib-util/docs/doxygen.cfg
r2037 r3669 24 24 # if some version control system is used. 25 25 26 PROJECT_NUMBER = 26 PROJECT_NUMBER = $(PJ_VERSION) 27 27 28 28 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) … … 31 31 # where doxygen was started. If left blank the current directory will be used. 32 32 33 OUTPUT_DIRECTORY = docs 33 OUTPUT_DIRECTORY = docs/$(PJ_VERSION) 34 34 35 35 # The OUTPUT_LANGUAGE tag is used to specify the language in which all -
pjproject/trunk/pjlib-util/docs/header.html
r755 r3669 1 1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 2 2 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 3 <title>$title </title>3 <title>$title ($projectnumber)</title> 4 4 <link href="/style/style.css" rel="stylesheet" type="text/css"> 5 5 </head><body> -
pjproject/trunk/pjlib/build/Makefile
r3423 r3669 1 1 include ../../build.mak 2 include ../../version.mak 2 3 include $(PJDIR)/build/common.mak 3 4 … … 58 59 59 60 doc: 60 cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 61 @if [ -n "$(WWWDIR)" ]; then \ 62 echo "Copying to $(WWWDIR)/pjlib/docs/html.." ; \ 63 cp -a ../docs/html/* $(WWWDIR)/pjlib/docs/html/ ; \ 61 cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 62 @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ 63 echo "Creating docs/$(PJ_VERSION)/pjlib/docs/html" ; \ 64 mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html ; \ 65 fi 66 @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ 67 echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html.." ; \ 68 cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html/ ; \ 64 69 fi 65 66 70 print: 67 71 $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib print_lib -
pjproject/trunk/pjlib/docs/doxygen.cfg
r2037 r3669 24 24 # if some version control system is used. 25 25 26 PROJECT_NUMBER = 26 PROJECT_NUMBER = $(PJ_VERSION) 27 27 28 28 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) … … 31 31 # where doxygen was started. If left blank the current directory will be used. 32 32 33 OUTPUT_DIRECTORY = docs 33 OUTPUT_DIRECTORY = docs/$(PJ_VERSION) 34 34 35 35 # The OUTPUT_LANGUAGE tag is used to specify the language in which all -
pjproject/trunk/pjlib/docs/header.html
r690 r3669 1 1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 2 2 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 3 <title>$title </title>3 <title>$title ($projectnumber)</title> 4 4 <link href="/style/style.css" rel="stylesheet" type="text/css"> 5 5 </head><body> -
pjproject/trunk/pjmedia/build/Makefile
r3664 r3669 1 1 include ../../build.mak 2 include ../../version.mak 2 3 3 4 THIRD_PARTY:=$(PJDIR)/third_party … … 142 143 143 144 doc: 144 cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 145 @if [ -n "$(WWWDIR)" ]; then \ 146 echo "Copying to $(WWWDIR)/pjmedia/docs/html.." ; \ 147 rm -rf $(WWWDIR)/pjmedia/docs/html/* ; \ 148 cp -a ../docs/html/* $(WWWDIR)/pjmedia/docs/html/ ; \ 145 cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 146 @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html" ] ; then \ 147 echo "Creating docs/$(PJ_VERSION)/pjmedia/docs/html" ; \ 148 mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html ; \ 149 fi 150 @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html" ] ; then \ 151 echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html.." ; \ 152 cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html/ ; \ 149 153 fi 150 154 -
pjproject/trunk/pjmedia/docs/doxygen.cfg
r3313 r3669 24 24 # if some version control system is used. 25 25 26 PROJECT_NUMBER = 26 PROJECT_NUMBER = $(PJ_VERSION) 27 27 28 28 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) … … 31 31 # where doxygen was started. If left blank the current directory will be used. 32 32 33 OUTPUT_DIRECTORY = docs 33 OUTPUT_DIRECTORY = docs/$(PJ_VERSION) 34 34 35 35 # The OUTPUT_LANGUAGE tag is used to specify the language in which all -
pjproject/trunk/pjmedia/docs/header.html
r690 r3669 1 1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 2 2 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 3 <title>$title </title>3 <title>$title ($projectnumber)</title> 4 4 <link href="/style/style.css" rel="stylesheet" type="text/css"> 5 5 </head><body> -
pjproject/trunk/pjnath/build/Makefile
r3319 r3669 4 4 5 5 include ../../build.mak 6 include ../../version.mak 6 7 include $(PJDIR)/build/common.mak 7 8 … … 79 80 80 81 doc: 81 cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 82 @if [ -n "$(WWWDIR)" ]; then \ 83 echo "Copying to $(WWWDIR)/pjnath/docs/html.." ; \ 84 cp -a ../docs/html/* $(WWWDIR)/pjnath/docs/html/ ; \ 82 cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 83 @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html" ] ; then \ 84 echo "Creating docs/$(PJ_VERSION)/pjnath/docs/html" ; \ 85 mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html ; \ 86 fi 87 @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html" ] ; then \ 88 echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html.." ; \ 89 cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html/ ; \ 85 90 fi 86 91 -
pjproject/trunk/pjnath/docs/doxygen.cfg
r2642 r3669 24 24 # if some version control system is used. 25 25 26 PROJECT_NUMBER = 26 PROJECT_NUMBER = $(PJ_VERSION) 27 27 28 28 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) … … 31 31 # where doxygen was started. If left blank the current directory will be used. 32 32 33 OUTPUT_DIRECTORY = docs 33 OUTPUT_DIRECTORY = docs/$(PJ_VERSION) 34 34 35 35 # The OUTPUT_LANGUAGE tag is used to specify the language in which all -
pjproject/trunk/pjnath/docs/header.html
r2642 r3669 1 1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 2 2 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 3 <title>$title </title>3 <title>$title ($projectnumber)</title> 4 4 <link href="/style/style.css" rel="stylesheet" type="text/css"> 5 5 </head><body> -
pjproject/trunk/pjsip/build/Makefile
r3664 r3669 5 5 6 6 include ../../build.mak 7 include ../../version.mak 7 8 include $(PJDIR)/build/common.mak 8 9 … … 111 112 112 113 doc: 113 cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 114 @if [ -n "$(WWWDIR)" ]; then \ 115 echo "Copying to $(WWWDIR)/pjsip/docs/html.." ; \ 116 cp -a ../docs/html/* $(WWWDIR)/pjsip/docs/html/ ; \ 114 cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 115 @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html" ] ; then \ 116 echo "Creating docs/$(PJ_VERSION)/pjsip/docs/html" ; \ 117 mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html ; \ 118 fi 119 @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html" ] ; then \ 120 echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html.." ; \ 121 cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html/ ; \ 117 122 fi 118 123 -
pjproject/trunk/pjsip/docs/doxygen.cfg
r3313 r3669 24 24 # if some version control system is used. 25 25 26 PROJECT_NUMBER = 26 PROJECT_NUMBER = $(PJ_VERSION) 27 27 28 28 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) … … 31 31 # where doxygen was started. If left blank the current directory will be used. 32 32 33 OUTPUT_DIRECTORY = docs 33 OUTPUT_DIRECTORY = docs/$(PJ_VERSION) 34 34 35 35 # The OUTPUT_LANGUAGE tag is used to specify the language in which all -
pjproject/trunk/pjsip/docs/header.html
r690 r3669 1 1 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 2 2 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 3 <title>$title </title>3 <title>$title ($projectnumber)</title> 4 4 <link href="/style/style.css" rel="stylesheet" type="text/css"> 5 5 </head><body>
Note: See TracChangeset
for help on using the changeset viewer.