X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=b6861e9c665c97055499dc28c6f1c82a5188e73e;hp=894874ae6f2d3502a5f7eaaf3424e3511e83ba05;hb=5d0a01dceb67e9bdcb95bcb2328baef5e7ea7d52;hpb=c7482b4dce114b1c09cbac2f4ef6d0defdb23258

diff --git a/Makefile b/Makefile
index 894874ae..b6861e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,60 @@
-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
 
-CXXWARNINGS_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings
-CWARNINGS_FLAGS=$(CXXWARNINGS_FLAGS)
+# 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)
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+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
 
-MYCFLAGS=$(CWARNINGS_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(CXXWARNINGS_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
+all_deps = Makefile Makefile.local Makefile.config \
+		   lib/Makefile lib/Makefile.local
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 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)
 
-MODULES=		\
-	notmuch.o	\
-	database.o	\
-	date.o		\
-	message.o	\
-	message-file.o	\
-	query.o		\
-	sha1.o		\
-	libsha1.o	\
-	xutil.o
+override LDFLAGS += \
+	$(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+	$(shell xapian-config --libs)
 
-all: $(PROGS)
+# 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) $(MYCXXFLAGS) $< -o $@
+# And get user settings from the output of configure
+include Makefile.config
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+%.o: %.cc $(all_deps)
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
 
-notmuch: $(MODULES)
-	$(CC) $(MYLDFLAGS) $^ -o $@
+%.o: %.c $(all_deps)
+	$(CC) -c $(CFLAGS) $< -o $@
 
-Makefile.dep: *.c *.cc
-	$(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+%.elc: %.el
+	emacs -batch -f batch-byte-compile $<
+
+.deps/%.d: %.c $(all_deps)
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+.deps/%.d: %.cc $(all_deps)
+	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+DEPS := $(SRCS:%.c=.deps/%.d)
+DEPS := $(DEPS:%.cc=.deps/%.d)
+-include $(DEPS)
 
 clean:
-	rm -f $(PROGS) *.o Makefile.dep
+	rm -f $(CLEAN); rm -rf .deps