diff options
| -rw-r--r-- | Makefile | 39 | ||||
| -rw-r--r-- | Makefile.local | 16 | ||||
| -rw-r--r-- | lib/Makefile | 5 | ||||
| -rw-r--r-- | lib/Makefile.local | 19 |
4 files changed, 48 insertions, 31 deletions
@@ -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 |