X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=9e44d90a3a35134cd7beb6d92b775fe0f77fb2e4;hp=1e7f5f2c88a4e6d902573bf4cacc6d13caf03491;hb=1ddba66a3f4a7a118bc774d16cde00739144afcf;hpb=146549321044615d9aef2b30cedccda9c49f3f38

diff --git a/Makefile b/Makefile
index 1e7f5f2c..9e44d90a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,53 @@
-PROGS=notmuch
-
+# 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)
 
-NOTMUCH_LDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` \
-		`xapian-config --libs`
+# Now smash together user's values with our extra values
+override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
 
-LIBRARY=			\
-	lib/database.o		\
-	lib/index.o		\
-	lib/libsha1.o		\
-	lib/message.o		\
-	lib/message-file.o	\
-	lib/query.o		\
-	lib/sha1.o		\
-	lib/tags.o		\
-	lib/thread.o		\
-	lib/xutil.o
+override LDFLAGS += \
+	$(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+	$(shell xapian-config --libs)
 
-MAIN=			\
-	notmuch.o
+# Include our local Makefile.local first so that its first target is default
+include Makefile.local
+include lib/Makefile.local
 
-all: $(PROGS)
+# And get user settings from the output of configure
+include Makefile.config
 
 %.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 $@
 
-notmuch: $(MAIN) $(LIBRARY)
-	$(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
+%.elc: %.el
+	emacs -batch -f batch-byte-compile $<
 
-Makefile.dep: *.c lib/*.c lib/*.cc
-	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
-	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+.deps/%.d: %.c
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
 
-notmuch.1.gz:
-	gzip --stdout notmuch.1 > notmuch.1.gz
+.deps/%.d: %.cc
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
 
-install: all notmuch.1.gz
-	install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
-	install -C -D notmuch.1.gz $(DESTDIR)/usr/share/man/man1
-	install -C -D notmuch-completion.bash \
-		$(DESTDIR)/etc/bash_completion.d/notmuch
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
 
 clean:
-	rm -f $(PROGS) lib/*.o *.o Makefile.dep
+	rm -f $(CLEAN); rm -rf .deps