X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=f3697861e75d540f20954a46589284a3db10e278;hp=436dacfc4c6318e76f076c007771afe34153f52f;hb=784e55d0f990350d0be8e54892f0eb3afe087fc5;hpb=e12a6b91ac795fb6e930b810f6aca2939ca5900e

diff --git a/Makefile b/Makefile
index 436dacfc..f3697861 100644
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,14 @@
-# Default FLAGS, (can be overriden by user such as "make CFLAGS=-O2")
-WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
-CFLAGS=-O2
+# We want the all target to be the implicit target (if no target is
+# given explicitly on the command line) so mention it first.
+all:
 
-# 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`
+# List all subdirectories here. Each contains its own Makefile.local
+subdirs = compat emacs lib
 
-# Now smash together user's values with our extra values
-override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
-override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
+# We make all targets depend on the Makefiles themselves.
+global_deps = Makefile Makefile.local \
+	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
-override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
-			`xapian-config --libs`
-
-# Include our local Makfile.local first so that its first target is default
-include Makefile.local
-include lib/Makefile.local
-
-# And get user settings from the output of configure
-include Makefile.config
-
-%.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
-
-%.o: %.c
-	$(CC) -c $(CFLAGS) $< -o $@
-
-.deps/%.d: %.c
-	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
-	sed 's,'$$(basename $*)'\.o[ :]*,$*.o $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
-
-.deps/%.d: %.cc
-	@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 $(CLEAN); rm -rf .deps
+# Finally, include all of the Makefile.local fragments where all the
+# real work is done.
+include Makefile.local $(subdirs:%=%/Makefile.local)