Makefile: Make the top-level Makefile a little more independent.

Previously, the top-level Makefile was explicitly adding -I./lib to
the compiler flags. However, that's something that's much better done
from within the Makefile.local fragment within the lib directory
itself.

diff --git a/Makefile b/Makefile
index 31c8de75570439fda17098e7b066c5a9e92e379d..8eee3096a76918f7c71a5ab0a6ceb880ee61e163 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,15 @@ CFLAGS=-g -O0
 
 # Additional flags that we will append to whatever the user set.
 # These aren't intended for the user to manipulate.
-extra_cflags = -I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+extra_cflags = `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
 extra_cxxflags = `xapian-config --cxxflags`
 
 # Now smash together user's values with our extra values
-override CFLAGS := $(CFLAGS) $(WARN_FLAGS) $(extra_cflags)
-override CXXFLAGS := $(CXXFLAGS) $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
+override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
 
-override LDFLAGS := $(LDFLAGS) `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
-                              `xapian-config --libs`
+override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
+                       `xapian-config --libs`
 
 # Include our local Makfile.local first so that its first target is default
 include Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 43882a3dfcb2dbdb9567ae9e3b9112615f27f219..b8286c94db19bfafe9919481d6b6f0c2f86bcf93 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -1,4 +1,5 @@
 dir=lib
+extra_cflags += -I$(dir)
 
 libnotmuch_c_srcs =            \
        $(dir)/libsha1.c        \