[systemd-commits] 2 commits - autogen.sh docs/.gitignore docs/gudev docs/libudev

[Lennart Poettering]

 autogen.sh              |   35 ++++++++++++++++++-----------------
 docs/.gitignore         |    1 +
 docs/gudev/.gitignore   |    6 ++++--
 docs/libudev/.gitignore |    6 ++++--
 4 files changed, 27 insertions(+), 21 deletions(-)

New commits:
commit 84c2626ec1e716f425ea0af5de6f50882916fa2b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 15 13:54:05 2012 +0200

    git: update gitignore

diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 0000000..e9fed44
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+/gtk-doc.make

commit 843605d372aa000a1ad120bb9d06d04e8b1da50c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 15 13:53:05 2012 +0200

    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 be88a8d..51b9d81 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 67ffcfd..e6f2371 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 c05d03d..f8dd67c 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/