From: Carl Worth <cworth@cworth.org>
Date: Tue, 10 Nov 2009 15:14:49 +0000 (-0800)
Subject: Implement a non-recursive make.
X-Git-Tag: 0.1~549
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5dccd851a8b79d8cedbfc8f2d2b8f9be2b7fa5a;p=notmuch.git

Implement a non-recursive make.

The idea here is that every Makefile at each lower level will be an
identical, tiny file that simply defers to a top-level make.

Meanwhile, the Makefile.local file at each level is a Makefile snippet
to be included at the top-level into a large, flat Makefile. As such,
it needs to define its rules with the entire relative directory to
each file, (typically in $(dir)). The local files can also append to
variables such as SRCS and CLEAN for files to be analyzed for
dependencies and to be cleaned.
---

diff --git a/Makefile b/Makefile
index a9d91d86..91ab9c02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-PROGS=notmuch
-
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
 NOTMUCH_DEPENDS_FLAGS=-I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
@@ -11,22 +9,9 @@ NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
 NOTMUCH_LDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` \
 		`xapian-config --libs`
 
-LIBRARY=			\
-	lib/database.o		\
-	lib/index.o		\
-	lib/libsha1.o		\
-	lib/message.o		\
-	lib/message-file.o	\
-	lib/query.o		\
-	lib/sha1.o		\
-	lib/tags.o		\
-	lib/thread.o		\
-	lib/xutil.o
-
-MAIN=			\
-	notmuch.o
-
-all: $(PROGS)
+# Include our local Makfile.local first so that its first target is default
+include Makefile.local
+include lib/Makefile.local
 
 %.o: %.cc
 	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(NOTMUCH_CXXFLAGS) $< -o $@
@@ -34,22 +19,14 @@ all: $(PROGS)
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
 
-notmuch: $(MAIN) $(LIBRARY)
-	$(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
-
-.depends: *.c lib/*.c lib/*.cc
+.depends: $(SRCS)
 	$(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
 	$(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
 -include .depends
 
-notmuch.1.gz:
-	gzip --stdout notmuch.1 > notmuch.1.gz
-
-install: all notmuch.1.gz
-	install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
-	install -C -D notmuch.1.gz $(DESTDIR)/usr/share/man/man1
-	install -C -D notmuch-completion.bash \
-		$(DESTDIR)/etc/bash_completion.d/notmuch
+CLEAN := $(CLEAN) .depends
 
 clean:
-	rm -f $(PROGS) lib/*.o *.o .depends
+	rm -f $(CLEAN)
+
+
diff --git a/Makefile.local b/Makefile.local
new file mode 100644
index 00000000..5474efc6
--- /dev/null
+++ b/Makefile.local
@@ -0,0 +1,16 @@
+all: notmuch
+
+notmuch: notmuch.o lib/notmuch.a
+	$(CC) $(NOTMUCH_LDFLAGS) $^ -o $@
+
+notmuch.1.gz:
+	gzip --stdout notmuch.1 > notmuch.1.gz
+
+install: all notmuch.1.gz
+	install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
+	install -C -D notmuch.1.gz $(DESTDIR)/usr/share/man/man1
+	install -C -D notmuch-completion.bash \
+		$(DESTDIR)/etc/bash_completion.d/notmuch
+
+SRCS  := $(SRCS) notmuch.c
+CLEAN := $(CLEAN) notmuch *.o
diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644
index 00000000..80d7059c
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,5 @@
+all:
+	make -C .. all
+
+clean:
+	make -C .. clean
diff --git a/lib/Makefile.local b/lib/Makefile.local
new file mode 100644
index 00000000..b5182bc4
--- /dev/null
+++ b/lib/Makefile.local
@@ -0,0 +1,19 @@
+dir=lib
+
+lib_notmuch_modules =		\
+	$(dir)/database.o	\
+	$(dir)/index.o		\
+	$(dir)/$(dir)sha1.o	\
+	$(dir)/message.o	\
+	$(dir)/message-file.o	\
+	$(dir)/query.o		\
+	$(dir)/sha1.o		\
+	$(dir)/tags.o		\
+	$(dir)/thread.o		\
+	$(dir)/xutil.o
+
+$(dir)/notmuch.a: $(lib_notmuch_modules)
+	$(AR) rcs $@ $^
+
+SRCS  := $(SRCS) lib/*.c lib/*.cc
+CLEAN := $(CLEAN) $(dir)/*.o $(dir)/notmuch.a