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

diff --git a/Makefile b/Makefile
index 7743ef52..b6861e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,34 +1,55 @@
+# Default FLAGS, (can be overridden 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 := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
+extra_cxxflags := $(shell xapian-config --cxxflags)
 
-NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
-NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
+emacs_lispdir := $(shell pkg-config emacs --variable sitepkglispdir)
+# Hard-code if this system doesn't have an emacs.pc file
+ifeq ($(emacs_lispdir),)
+	emacs_lispdir = $(prefix)/share/site-lisp
+endif
 
-NOTMUCH_LDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` \
-		`xapian-config --libs`
+all_deps = Makefile Makefile.local Makefile.config \
+		   lib/Makefile lib/Makefile.local
 
-# Include our local Makfile.local first so that its first target is default
+# Now smash together user's values with our extra values
+override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
+
+override LDFLAGS += \
+	$(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+	$(shell xapian-config --libs)
+
+# Include our local Makefile.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 $@
+# And get user settings from the output of configure
+include Makefile.config
+
+%.o: %.cc $(all_deps)
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
+
+%.o: %.c $(all_deps)
+	$(CC) -c $(CFLAGS) $< -o $@
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
+%.elc: %.el
+	emacs -batch -f batch-byte-compile $<
 
-.deps/%.d: %.c
+.deps/%.d: %.c $(all_deps)
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CC) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
-.deps/%.d: %.cc
+.deps/%.d: %.cc $(all_deps)
 	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_CXX_DEPENDS_FLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
 
 DEPS := $(SRCS:%.c=.deps/%.d)