X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=6d1f3d82c5d253078e977518001e2e6c13be9f23;hp=7743ef52cf98f0b3babd0cd99d9c8c47f6de49bb;hb=93dcc3b695e19dd36cc8f638c6e01ecbbd9a447d;hpb=97c7cffdc6e0047bb49a899b013516bc3022e580

diff --git a/Makefile b/Makefile
index 7743ef52..6d1f3d82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,38 @@
+# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+CFLAGS=-O2
 
-NOTMUCH_DEPENDS_FLAGS=-I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
-NOTMUCH_CXX_DEPENDS_FLAGS=$(NOTMUCH_DEPENDS_FLAGS) `xapian-config --cxxflags`
+# Additional flags that we will append to whatever the user set.
+# These aren't intended for the user to manipulate.
+extra_cflags = `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+extra_cxxflags = `xapian-config --cxxflags`
 
-NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
-NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
+# Now smash together user's values with our extra values
+override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
 
-NOTMUCH_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
 include lib/Makefile.local
 
 %.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(NOTMUCH_CXXFLAGS) $< -o $@
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
 
 %.o: %.c
-	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
 .deps/%.d: %.c
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CC) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) $< > $@.$$$$; \
+	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
 	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
 .deps/%.d: %.cc
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_CXX_DEPENDS_FLAGS) $< > $@.$$$$; \
+	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
 	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$