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

diff --git a/autogen.sh b/autogen.sh
index be88a8d6f37496485c23abb49c9423ed594f683c..51b9d81d589dbd4ded8daf2d1f565172bf41b0ba 100755 (executable)
--- 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
 #  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
 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
 else

-    gtkdocize
-    gtkdocargs=--enable-gtk-doc
+        gtkdocize --docdir docs/
+        gtkdocargs=--enable-gtk-doc

 fi
 
 intltoolize --force --automake
 autoreconf --force --install --symlink
 
 libdir() {
 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="\
 }
 
 args="\


@@ -51,14 +51,15 @@ args="$args \
 "
 fi
 
 "
 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
 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
 fi

diff --git a/docs/gudev/.gitignore b/docs/gudev/.gitignore
index 67ffcfd59806e8d46c32bd9898b571216391b616..e6f2371ab140932ec815ff10e1b5ee67f238c79e 100644 (file)
--- a/docs/gudev/.gitignore
+++ b/docs/gudev/.gitignore
@@ -1,3 +1,4 @@
+/*.bak

 /gtk-doc.make
 /version.xml
 /Makefile
 /gtk-doc.make
 /version.xml
 /Makefile


@@ -12,6 +13,7 @@
 /gudev.interfaces
 /gudev.prerequisites
 /gudev.signals
 /gudev.interfaces
 /gudev.prerequisites
 /gudev.signals

-/html/*
-/xml/*
+/html/
+/xml/

 /*.stamp
 /*.stamp

+/tmpl/

diff --git a/docs/libudev/.gitignore b/docs/libudev/.gitignore
index c05d03d7950480a110bd4be47f94f4df68c5f775..f8dd67c50a639b9bd66b75aa79aa2cd038da5aa7 100644 (file)
--- a/docs/libudev/.gitignore
+++ b/docs/libudev/.gitignore
@@ -12,6 +12,8 @@
 /libudev.interfaces
 /libudev.prerequisites
 /libudev.signals
 /libudev.interfaces
 /libudev.prerequisites
 /libudev.signals

-/html/*
-/xml/*
+/html/
+/xml/

 /*.stamp
 /*.stamp

+/*.bak
+/tmpl/