Fix up Makefile for build.

Must set extra_c(xx)flags before including subdir Makefile.local's,
so that there is a blank slate that the subdirs can add on to.

Must include subdir Makefile.local's before global one, otherwise
the compat sources are not added to the list of those to be
compiled.

Signed-off-by: Aaron Ecay <aaronecay@gmail.com>

diff --git a/Makefile b/Makefile
index 076efc79b9532c3e1b80a8ef5b9687456a2fe895..faaaec6419b9ae7ec4d96b1b0d28ceac00739446 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,13 @@ subdirs = compat completion emacs lib
 global_deps = Makefile Makefile.local \
        $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
+
+extra_cflags :=
+extra_cxxflags :=
+
 # Finally, include all of the Makefile.local fragments where all the
 # real work is done.
-include Makefile.local $(subdirs:%=%/Makefile.local)
+
+include $(subdirs:%=%/Makefile.local) Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 8b926f8d71e4d65a186e57eeabd5aa85e5a6d507..fbff9497ce682e6ad6663e863157adfc29d17068 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -33,11 +33,6 @@ Makefile.config: configure
        @echo ""
        ./configure
 
-# Sub-directory Makefile.local fragments can append to these variables
-# to have directory-specific cflags as necessary.
-extra_cflags :=
-extra_cxxflags :=
-
 # Smash together user's values with our extra values
 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
 FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)

diff --git a/compat/Makefile.local b/compat/Makefile.local
index 81e6c707d6ad9f2e1ff2c4a3b14aa9829eaa242f..50f6cd191468b10d6e7c730ee433e6807719f627 100644 (file)
--- a/compat/Makefile.local
+++ b/compat/Makefile.local
@@ -3,7 +3,7 @@
 dir := compat
 extra_cflags += -I$(dir)
 
-notmuch_compat_srcs =
+notmuch_compat_srcs :=
 
 ifneq ($(HAVE_GETLINE),1)
 notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c