notmuch.el: Add final '*' to generated buffer names.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index bf34b8a5160bd49bc4cc3ac8980f19aed44e909f..26ab8da8e748b32beb143e4f92d7ab02707a5eb2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,25 +2,30 @@ PROGS=notmuch
 
 WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
 
-CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc`
-CXXDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 talloc` `xapian-config --cxxflags`
+CDEPENDS_FLAGS=`pkg-config --cflags glib-2.0 gmime-2.4 talloc`
+CXXDEPENDS_FLAGS=$(CDEPENDS_FLAGS) `xapian-config --cxxflags`
 
 MYCFLAGS=$(WARN_FLAGS) -O0 -g $(CDEPENDS_FLAGS)
 MYCXXFLAGS=$(WARN_FLAGS) -O0 -g $(CXXDEPENDS_FLAGS)
 
-MYLDFLAGS=`pkg-config --libs glib-2.0 talloc` `xapian-config --libs`
+MYLDFLAGS=`pkg-config --libs glib-2.0 gmime-2.4 talloc` `xapian-config --libs`
 
-MODULES=               \
-       notmuch.o       \
+LIBRARY=               \
        database.o      \
        date.o          \
+       index.o         \
+       libsha1.o       \
        message.o       \
        message-file.o  \
        query.o         \
        sha1.o          \
-       libsha1.o       \
+       tags.o          \
+       thread.o        \
        xutil.o
 
+MAIN=                  \
+       notmuch.o
+
 all: $(PROGS)
 
 %.o: %.cc
@@ -29,12 +34,16 @@ all: $(PROGS)
 %.o: %.c
        $(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
 
-notmuch: $(MODULES)
+notmuch: $(MAIN) $(LIBRARY)
        $(CC) $(MYLDFLAGS) $^ -o $@
 
 Makefile.dep: *.c *.cc
-       $(CC) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $^ > $@
+       $(CXX) -M $(CPPFLAGS) $(CDEPENDS_FLAGS) $(CXXDEPENDS_FLAGS) $^ > $@
 -include Makefile.dep
 
+install:
+       install -C -D notmuch $(DESTDIR)/usr/bin/notmuch
+       install -C -D notmuch-completion.bash $(DESTDIR)/etc/bash_completion.d/notmuch
+
 clean:
        rm -f $(PROGS) *.o Makefile.dep