diff options
| -rw-r--r-- | Makefile | 15 | ||||
| -rwxr-xr-x | configure | 8 |
2 files changed, 12 insertions, 11 deletions
@@ -2,16 +2,6 @@ # given explicitly on the command line) so mention it first. all: -# List all subdirectories here. Each contains its own Makefile.local. -# Use of '=', without '+=', seems to be required for out-of-tree -# builds to work. -subdirs = compat completion doc emacs lib parse-time-string \ - performance-test util test test/test-databases - -# We make all targets depend on the Makefiles themselves. -global_deps = Makefile Makefile.config Makefile.local \ - $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local) - # Sub-directory Makefile.local fragments can append to these variables # to have directory-specific cflags as necessary. @@ -27,6 +17,11 @@ extra_cxxflags := srcdir ?= . include Makefile.config + +# We make all targets depend on the Makefiles themselves. +global_deps = Makefile Makefile.config Makefile.local \ + $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local) + Makefile.config: $(srcdir)/configure ifeq ($(configure_options),) @echo "" @@ -19,11 +19,14 @@ readonly DEFAULT_IFS="$IFS" srcdir=$(dirname "$0") +subdirs="util compat lib parse-time-string completion doc emacs" +subdirs="${subdirs} performance-test test test/test-databases" + # 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 + for dir in . ${subdirs}; do mkdir -p "$dir" cp "$srcdir"/"$dir"/Makefile.local "$dir" cp "$srcdir"/"$dir"/Makefile "$dir" @@ -698,6 +701,9 @@ cat > Makefile.config <<EOF # directory (the current directory at the time configure was run). srcdir = ${srcdir} +# subdirectories to build +subdirs = ${subdirs} + configure_options = $@ # We use vpath directives (rather than the VPATH variable) since the |