From: Carl Worth Date: Wed, 9 Mar 2011 23:02:42 +0000 (-0800) Subject: build: Add support for non-source-directory builds. X-Git-Tag: debian/0.6_254~183 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=3e4a9d60a9419621b08c647a306843d76c47c2cb build: Add support for non-source-directory builds. Such as: mkdir build cd build ../configure make This is implemented by having the configure script set a srcdir variable in Makefile.config, and then sprinkling $(srcdir) into various make rules. We also use vpath directives to convince GNU make to find the source files from the original source directory. --- diff --git a/Makefile b/Makefile index 7549b40d..4ca74a3f 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ extra_cxxflags := # Makefile.config if it doesn't exist yet. And add Makefile.config to # our global dependency list. include Makefile.config -Makefile.config: configure +Makefile.config: $(srcdir)/configure @echo "" @echo "Note: Calling ./configure with no command-line arguments. This is often fine," @echo " but if you want to specify any arguments (such as an alternate prefix" diff --git a/Makefile.local b/Makefile.local index 38ead11d..50bba640 100644 --- a/Makefile.local +++ b/Makefile.local @@ -12,7 +12,7 @@ PACKAGE=notmuch IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi) -VERSION:=$(shell cat version) +VERSION:=$(shell cat ${srcdir}/version) ifneq ($(MAKECMDGOALS),release) ifneq ($(MAKECMDGOALS),release-message) ifeq ($(IS_GIT),yes) @@ -81,7 +81,7 @@ dist: $(TAR_FILE) # targets in the case of parallel invocation of make (-j). # # We carefully ensure that our VERSION variable is passed down to any -# sub-ordinate make invocations (which won't otherwhise know that they +# sub-ordinate make invocations (which won't otherwise know that they # are part of the release and need to take the version from the # version file). .PHONY: release diff --git a/TODO b/TODO index a34d95fa..f8147b19 100644 --- a/TODO +++ b/TODO @@ -255,16 +255,6 @@ existing messages at the next database upgrade). Add support for the user to specify custom headers to be indexed (and re-index these for existing messages at the next database upgrade). -Build system ------------- -Fix to allow a non-source-directory build. For example, the below -should be made to work: - - mkdir build_dir - cd build_dir - ../configure - make - Test suite ---------- Achieve 100% test coverage with the test suite. diff --git a/compat/Makefile.local b/compat/Makefile.local index 653fc710..504eb715 100644 --- a/compat/Makefile.local +++ b/compat/Makefile.local @@ -1,7 +1,7 @@ # -*- makefile -*- dir := compat -extra_cflags += -I$(dir) +extra_cflags += -I$(srcdir)/$(dir) notmuch_compat_srcs := diff --git a/completion/Makefile.local b/completion/Makefile.local index 755b0f7e..dfc12713 100644 --- a/completion/Makefile.local +++ b/completion/Makefile.local @@ -5,8 +5,8 @@ dir := completion # The dir variable will be re-assigned to later, so we can't use it # directly in any shell commands. Instead we save its value in other, # private variables that we can use in the commands. -bash_script := $(dir)/notmuch-completion.bash -zsh_script := $(dir)/notmuch-completion.zsh +bash_script := $(srcdir)/$(dir)/notmuch-completion.bash +zsh_script := $(srcdir)/$(dir)/notmuch-completion.zsh install: install-$(dir) diff --git a/configure b/configure index 3d1efb0b..157ecf39 100755 --- a/configure +++ b/configure @@ -1,5 +1,26 @@ #! /bin/sh +srcdir=$(dirname "$0") + +# For a non-srcdir configure invocation (such as ../configure), create +# the directory structure and copy Makefiles. +if [ "$srcdir" != "." ]; then + + for dir in . $(grep "^subdirs *=" "$srcdir"/Makefile | sed -e "s/subdirs *= *//"); do + mkdir -p "$dir" + cp "$srcdir"/"$dir"/Makefile.local "$dir" + cp "$srcdir"/"$dir"/Makefile "$dir" + done + + # Easiest way to get the test suite to work is to just copy the + # whole thing into the build directory. + cp -a "$srcdir"/test/* test + + # Emacs only likes to generate compiled files next to the .el files + # by default so copy these as well (which is not ideal0. + cp -a "$srcdir"/emacs/*.el emacs +fi + # Set several defaults (optionally specified by the user in # environemnt variables) CC=${CC:-gcc} @@ -424,7 +445,7 @@ EOF fi printf "Checking for getline... " -if ${CC} -o compat/have_getline compat/have_getline.c > /dev/null 2>&1 +if ${CC} -o compat/have_getline "$srcdir"/compat/have_getline.c > /dev/null 2>&1 then printf "Yes.\n" have_getline=1 @@ -435,7 +456,7 @@ fi rm -f compat/have_getline printf "Checking for strcasestr... " -if ${CC} -o compat/have_strcasestr compat/have_strcasestr.c > /dev/null 2>&1 +if ${CC} -o compat/have_strcasestr "$srcdir"/compat/have_strcasestr.c > /dev/null 2>&1 then printf "Yes.\n" have_strcasestr=1 @@ -508,6 +529,24 @@ cat > Makefile.config <