Makefile: Remove unused variable emacs_startdir

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index b4d77b4e3fcaf95134869b07e709d3f4e48afce0..9e44d90a3a35134cd7beb6d92b775fe0f77fb2e4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,42 +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
+
+# 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)
 
-MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
-MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_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)
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+override LDFLAGS += \
+       $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+       $(shell xapian-config --libs)
 
-MODULES=               \
-       notmuch.o       \
-       database.o      \
-       date.o          \
-       message.o       \
-       message-file.o  \
-       query.o         \
-       sha1.o          \
-       tags.o          \
-       thread.o        \
-       libsha1.o       \
-       xutil.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) $(MYCXXFLAGS) $< -o $@
+       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
 
 %.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+       $(CC) -c $(CFLAGS) $< -o $@
+
+%.elc: %.el
+       emacs -batch -f batch-byte-compile $<
+
+.deps/%.d: %.c
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
+       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
 
-notmuch: $(MODULES)
-       $(CC) $(MYLDFLAGS) $^ -o $@
+.deps/%.d: %.cc
+       @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
+       $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
+       sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
+       rm -f $@.$$$$
 
-Makefile.dep: *.c *.cc
-       $(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
--include Makefile.dep
+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