Drop redundant CFLAGS, was already included in CXXFLAGS

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 34716c294bb6233ab6ec2e17ca377a65da2c177a..f9f7af03bcac8ecb874395c3aa94eb708633b183 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +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
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags glib-2.0`
-MYCXXFLAGS=$(MYCFLAGS) `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)
 
-MYLDFLAGS=`pkg-config --libs glib-2.0` `xapian-config --libs`
+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
 
-all: $(PROGS)
+all_deps = Makefile Makefile.local Makefile.config \
+                  lib/Makefile lib/Makefile.local
 
-%.o: %.cc
-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+# Now smash together user's values with our extra values
+override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
 
-%.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
+override LDFLAGS += \
+       $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+       $(shell xapian-config --libs)
 
-notmuch: notmuch.o database.o date.o message-file.o xutil.o
-       $(CC) $(MYLDFLAGS) $^ -o $@
+# Include our local Makefile.local first so that its first target is default
+include Makefile.local
+include lib/Makefile.local
 
-Makefile.dep: *.c *.cc
-       $(CC) -M $(CPPFLAGS) $(MYCFLAGS) $^ > $@
--include Makefile.dep
+# And get user settings from the output of configure
+include Makefile.config
+
+%.o: %.cc $(all_deps)
+       $(CXX) -c $(CXXFLAGS) $< -o $@
+
+%.o: %.c $(all_deps)
+       $(CC) -c $(CFLAGS) $< -o $@
+
+%.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