X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=Makefile;h=faaaec6419b9ae7ec4d96b1b0d28ceac00739446;hb=c10085c77b407d9ea704f8b4f9e0a805f63e72cb;hp=6d1f3d82c5d253078e977518001e2e6c13be9f23;hpb=da5a2e2fe68a6f3393053e4cd2eef66331b42872;p=notmuch

diff --git a/Makefile b/Makefile
index 6d1f3d82..faaaec64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,21 @@
-# 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 completion 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`
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
 
-# Include our local Makfile.local first so that its first target is default
-include Makefile.local
-include lib/Makefile.local
+extra_cflags :=
+extra_cxxflags :=
 
-%.o: %.cc
-	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
+# Finally, include all of the Makefile.local fragments where all the
+# real work is done.
 
-%.o: %.c
-	$(CC) -c $(CFLAGS) $< -o $@
-
-.deps/%.d: %.c
-	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
-
-.deps/%.d: %.cc
-	@set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
-	$(CXX) -M $(CPPFLAGS) $(CXXFLAGS) $< > $@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
-	rm -f $@.$$$$
-
-DEPS := $(SRCS:%.c=.deps/%.d)
-DEPS := $(DEPS:%.cc=.deps/%.d)
--include $(DEPS)
-
-clean:
-	rm -f $(CLEAN); rm -rf .deps
+include $(subdirs:%=%/Makefile.local) Makefile.local