diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-05-15 13:53:05 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-05-15 13:54:29 +0200 |
| commit | 843605d372aa000a1ad120bb9d06d04e8b1da50c (patch) | |
| tree | 28624151bfdc39fe4df19d759bcad299de9f8929 | |
| parent | 7cf55dd0700d2b93f18a1bdc50b3c864d0af2246 (diff) | |
build-sys: move gtk-doc stuff into its own subdir and reindent autogen.sh
We moved most other build noise files into their own subdirs, so let's
do this for gtk-doc too
| -rwxr-xr-x | autogen.sh | 35 | ||||
| -rw-r--r-- | docs/gudev/.gitignore | 6 | ||||
| -rw-r--r-- | docs/libudev/.gitignore | 6 |
3 files changed, 26 insertions, 21 deletions
diff --git a/autogen.sh b/autogen.sh index be88a8d6f3..51b9d81d58 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,25 +16,25 @@ # along with systemd; If not, see <http://www.gnu.org/licenses/>. if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then - cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ - chmod +x .git/hooks/pre-commit && \ - echo "Activated pre-commit hook." + cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ + chmod +x .git/hooks/pre-commit && \ + echo "Activated pre-commit hook." fi GTKDOCIZE=$(which gtkdocize 2>/dev/null) if test -z $GTKDOCIZE; then - echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." - echo 'EXTRA_DIST =' > gtk-doc.make + echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." + echo 'EXTRA_DIST =' > gtk-doc.make else - gtkdocize - gtkdocargs=--enable-gtk-doc + gtkdocize --docdir docs/ + gtkdocargs=--enable-gtk-doc fi intltoolize --force --automake autoreconf --force --install --symlink libdir() { - echo $(cd $1/$(gcc -print-multi-os-directory); pwd) + echo $(cd $1/$(gcc -print-multi-os-directory); pwd) } args="\ @@ -51,14 +51,15 @@ args="$args \ " fi -echo -echo "----------------------------------------------------------------" -echo "Initialized build system. For a common configuration please run:" -echo "----------------------------------------------------------------" -echo -echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args" -echo if [ "x$1" == "xc" ]; then - ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args - make clean + ./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args + make clean +else + echo + echo "----------------------------------------------------------------" + echo "Initialized build system. For a common configuration please run:" + echo "----------------------------------------------------------------" + echo + echo "./configure CFLAGS='-g -O0 -Wp,-U_FORTIFY_SOURCE' $args" + echo fi diff --git a/docs/gudev/.gitignore b/docs/gudev/.gitignore index 67ffcfd598..e6f2371ab1 100644 --- a/docs/gudev/.gitignore +++ b/docs/gudev/.gitignore @@ -1,3 +1,4 @@ +/*.bak /gtk-doc.make /version.xml /Makefile @@ -12,6 +13,7 @@ /gudev.interfaces /gudev.prerequisites /gudev.signals -/html/* -/xml/* +/html/ +/xml/ /*.stamp +/tmpl/ diff --git a/docs/libudev/.gitignore b/docs/libudev/.gitignore index c05d03d795..f8dd67c50a 100644 --- a/docs/libudev/.gitignore +++ b/docs/libudev/.gitignore @@ -12,6 +12,8 @@ /libudev.interfaces /libudev.prerequisites /libudev.signals -/html/* -/xml/* +/html/ +/xml/ /*.stamp +/*.bak +/tmpl/ |