Build in srcdir != builddir fashion by default

Naturally this doesn't apply to tarballs

diff --git a/.gitignore b/.gitignore
index cd5978e82b2d3066d17a966350682cd82a87d826..5c18615b3b202f178c432cd9fe32436ac2cde248 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ config.sub
 configure
 configure.tmp
 depcomp
+makefile
 install-sh
 INSTALL
 libtool
@@ -61,8 +62,14 @@ x86_64-w64-mingw32
 /x86_64_w64-mingw32/
 
 /build/m4/*.m4
+/build/common
 /build/coverage
 /build/coverage.info
+/build/doc/
+/build/p11-kit/
+/build/p11-kit-[0123456789]*/
+/build/po/
+/build/trust/
 /local
 
 /common/tests/hash-test

diff --git a/Makefile.am b/Makefile.am
index 03fc5dc78fa4cbc5e86488f7e1401a985874f316..7170058b0af9d8d459ec68dde61f43bdb9c8ae76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,6 @@ TRUST_DIR =
 endif
 
 SUBDIRS = \
-       build \
        common \
        p11-kit \
        $(TRUST_DIR) \
@@ -64,7 +63,8 @@ upload-release: $(DIST_ARCHIVES)
        scp $(DIST_ARCHIVES) $(DIST_ARCHIVES).sig $(WEBHOST):$(WEBBASE)/releases/
 
 EXTRA_DIST = \
-       config.rpath \
+       build/Makefile.tests \
+       build/Makefile.decl \
        HACKING
 
 transifex:

diff --git a/autogen.sh b/autogen.sh
index 696f490ac8b0dcbf84ca5966584b3c3b7b2d9b39..96cb604fcc397e9a3a37932462a21e094fc63fca 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,6 +27,7 @@ test -f configure.ac~ && mv configure.ac~ configure.ac
 
 autoreconf --force --install --verbose
 if test x"$NOCONFIGURE" = x; then
-  exec ./configure "$@"
+  cd build/
+  exec ../configure "$@"
 fi
 

diff --git a/automaint.sh b/automaint.sh
index 487bf5084a74246fb50274e9b593a5951467c672..8859dccc31f001b91c6f582f80c5ac68c696d945 100755 (executable)
--- a/automaint.sh
+++ b/automaint.sh
@@ -23,7 +23,7 @@ configure()
 # Configure the local build. To control which arguments are used create a
 # CONFIG_SITE script as directed in the autoconf documentation:
 # http://www.gnu.org/software/autoconf/manual/autoconf.html#Site-Defaults
-configure ./local --prefix=/usr --enable-doc --enable-coverage $ARGS "$@"
+configure ./build --prefix=/usr --enable-doc --enable-coverage $ARGS "$@"
 
 # Configure the cross builds
 for cross in $CROSS; do
@@ -37,7 +37,7 @@ done
 
        for target in all check clean distclean; do
                echo "$target:"
-               echo '  $(MAKE) -C ./local' $target
+               echo '  $(MAKE) -C ./build' $target
                echo '  @for dir in $(CROSS); do \'
                echo '          $(MAKE) -C ./$$dir' $target '; \'
                echo '  done'
@@ -46,7 +46,7 @@ done
        for target in distcheck memcheck leakcheck hellcheck install upload-coverage \
                coverage upload-doc upload-release transifex; do
                echo "$target:"
-               echo '  $(MAKE) -C ./local' $target
+               echo '  $(MAKE) -C ./build' $target
        done
 
 ) > ./makefile

diff --git a/build/Makefile.am b/build/Makefile.am
deleted file mode 100644 (file)
index 11337b1..0000000
--- a/build/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-SUBDIRS = certs
-
-EXTRA_DIST = \
-       Makefile.tests
-
-memcheck:
-
-leakcheck:

diff --git a/build/certs/Makefile.am b/build/certs/Makefile
similarity index 98%
rename from build/certs/Makefile.am
rename to build/certs/Makefile
index 031cba074dca212f6f92ba2d9dedb16fea6981d3..4e61b1480411113ba798117025d653d0564589f7 100644 (file)
--- a/build/certs/Makefile.am
+++ b/build/certs/Makefile
@@ -3,7 +3,7 @@
 # We copy everything into its final location, and those test files are
 # distributed in the tarballs
 
-TRUST = $(top_srcdir)/trust/tests
+TRUST = ../../trust/tests
 
 prepare-certs:
        cp -v cacert3.der $(TRUST)/input/anchors

diff --git a/configure.ac b/configure.ac
index b9b538aa0d554b49ba50b2ef5d70a9cc0c60da80..453807906d7c2f618b3639d83fc1c645afcc6580 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -500,8 +500,6 @@ privatedir='${libdir}/p11-kit'
 AC_SUBST(privatedir)
 
 AC_CONFIG_FILES([Makefile
-       build/Makefile
-       build/certs/Makefile
        common/Makefile
        common/tests/Makefile
        doc/Makefile

diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am
index ce32df36484fad14b0fb2998ba5d709a4b4640c9..c9ff26415b09cd58ac0569a1eac32a9db476e360 100644 (file)
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -130,7 +130,8 @@ XSLTPROC_FLAGS = \
         --stringparam man.copyright.section.enabled 0
 
 XSLTPROC_MAN = \
-       $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+       $(XSLTPROC) $(XSLTPROC_FLAGS) --path $(builddir) \
+       http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 
 trust.1: trust.xml $(generate_files)
        $(AM_V_GEN) $(XSLTPROC_MAN) $<