Implement a non-recursive make.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 4af5a2ebfa5de2d38506e2dfd2e772bc30fe2ea0..91ab9c02cd623f583e03b5b241858f4b0fb40f43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,32 @@
-PROGS=notmuch notmuch-index-message xapian-dump
+WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
-MYCFLAGS=-Wall -O0 -g `pkg-config --cflags gmime-2.4`
-MYCXXFLAGS=$(MYCFLAGS) `xapian-config --cxxflags`
+NOTMUCH_DEPENDS_FLAGS=-I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+NOTMUCH_CXX_DEPENDS_FLAGS=$(NOTMUCH_DEPENDS_FLAGS) `xapian-config --cxxflags`
 
-MYLDFLAGS=`pkg-config --libs gmime-2.4` `xapian-config --libs`
+NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS)
+NOTMUCH_CXXFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_CXX_DEPENDS_FLAGS)
 
-all: $(PROGS)
+NOTMUCH_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
 
 %.o: %.cc
-       $(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $^ -o $@
+       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $(NOTMUCH_CXXFLAGS) $< -o $@
 
 %.o: %.c
-       $(CC) -c $(CFLAGS) $(MYCFLAGS) $^ -o $@
-
-notmuch: notmuch.o database.o xutil.o
-       $(CC) $(MYLDFLAGS) $^ -o $@
+       $(CC) -c $(CFLAGS) $(NOTMUCH_CFLAGS) $< -o $@
 
-notmuch-index-message: notmuch-index-message.cc
-       $(CXX) $(CXXFLAGS) $(MYCXXFLAGS) notmuch-index-message.cc `pkg-config --cflags --libs gmime-2.4` `xapian-config --cxxflags --libs` -o notmuch-index-message
+.depends: $(SRCS)
+       $(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \
+       $(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@
+-include .depends
 
-xapian-dump: xapian-dump.cc
-       $(CXX) $(CXXFLAGS) $(MYCXXFLAGS) xapian-dump.cc `xapian-config --libs --cxxflags` -o xapian-dump
+CLEAN := $(CLEAN) .depends
 
 clean:
-       rm -f $(PROGS) *.o
+       rm -f $(CLEAN)
+
+