[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kde-common/admin
From: Adriaan de Groot <groot () kde ! org>
Date: 2005-06-30 19:46:05
Message-ID: 1120160765.753022.15982.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 430296 by adridg:
Suppress warnings when there is no Makefile.am.in; move DOXYGEN_SET support to after the \
default stuff so Makefile.am can even override INPUT; add @topdir@ support in DOXYGEN_SET. All \
these are needed for the KDevelop dox (I'd rather hack doxygen.sh than mess with KDevelop's \
entire Dox setup).
M +27 -7 doxygen.sh
--- trunk/KDE/kde-common/admin/doxygen.sh #430295:430296
@@ -220,10 +220,14 @@
idirs=`cd "$top_srcdir" && ls -1 | sort`
fi
-compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
-compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n 1`
+compilefirst=""
+compilelast=""
+if test -f "$top_srcdir/"Makefile.am.in ; then
+ compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n \
1` + compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' "$top_srcdir/"Makefile.am.in | head -n \
1` +fi
for i in $idirs; do
- if test -f "$top_srcdir/"$i/Makefile.am; then
+ if test -f "$top_srcdir/$i"/Makefile.am; then
case " $compilefirst $compilelast " in
*" $i "*) ;;
*) dirs="$dirs $i"
@@ -238,11 +242,17 @@
done
(for d in $dirs; do
- list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n \
1` + list=""
+ if test -f "$top_srcdir/"Makefile.am.in ; then
+ list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n \
1` + fi
for s in $list; do
echo $s $d
done
- list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n 1`
+ list=""
+ if test -f "$top_srcdir/"Makefile.am.in ; then
+ list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" "$top_srcdir/"Makefile.am.in | head -n \
1` + fi
for s in $list; do
echo $d $s
done
@@ -362,9 +372,9 @@
fi
cat "$top_builddir/Doxyfile.in" >> Doxyfile
- grep ^DOXYGEN "$top_srcdir/Makefile.am.in" >> Doxyfile
- echo "INPUT = $top_srcdir" >> Doxyfile ; \
+
+ echo "INPUT = $top_srcdir" >> Doxyfile
echo "OUTPUT_DIRECTORY = $top_builddir" >> Doxyfile ; \
echo "FILE_PATTERNS = *.dox" >> Doxyfile ; \
echo "RECURSIVE = NO" >> Doxyfile ; \
@@ -372,6 +382,16 @@
echo "HTML_OUTPUT = ." >> Doxyfile ; \
apidox_htmlfiles "main"
+ # KDevelop has a top-level Makefile.am with settings.
+ for i in "$top_srcdir/Makefile.am.in" "$top_srcdir/Makefile.am"
+ do
+ if test -f "$i" ; then
+ grep '^DOXYGEN_SET_' "$i" | \
+ sed -e 's+DOXYGEN_SET_++' -e "s+@topdir@+$top_srcdir+" >> Doxyfile
+ break
+ fi
+ done
+
doxygen Doxyfile
( cd "$top_srcdir" && grep -l ^include.*Doxyfile.am `find . -name Makefile.am` ) | sed -e \
's+/Makefile.am$++' -e 's+^\./++' | sort > subdirs.in
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic