Drop redundant CFLAGS, was already included in CXXFLAGS

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 19b51491e1154bc33c61173d03effdfdb51d20c0..f9f7af03bcac8ecb874395c3aa94eb708633b183 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,52 @@
-# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
+# 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 = `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
-extra_cxxflags = `xapian-config --cxxflags`
+extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
+extra_cxxflags := $(shell 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
+
+all_deps = Makefile Makefile.local Makefile.config \
+                  lib/Makefile lib/Makefile.local
 
 # 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 += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
-                       `xapian-config --libs`
+override LDFLAGS += \
+       $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+       $(shell xapian-config --libs)
 
-# Include our local Makfile.local first so that its first target is default
+# 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) $< -o $@
+# And get user settings from the output of configure
+include Makefile.config
 
-%.o: %.c
+%.o: %.cc $(all_deps)
+       $(CXX) -c $(CXXFLAGS) $< -o $@
+
+%.o: %.c $(all_deps)
        $(CC) -c $(CFLAGS) $< -o $@
 
-.deps/%.d: %.c
+%.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
+.deps/%.d: %.cc $(all_deps)
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
        $(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
        sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \