diff options
| author |  Carl Worth <cworth@cworth.org> | 2009-11-09 16:12:28 -0800 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2009-11-09 16:24:03 -0800 |
| commit | 146549321044615d9aef2b30cedccda9c49f3f38 (patch) | |
| tree | d12ae3b42b8bca295c8d9443f455690191db1a7a | |
| parent | 8ae1c3c6e11f7c8d4066ef3d8affe4d07528807b (diff) | |
libify: Move library sources down into lib directory.
A "make" invocation still works from the top-level, but not from
down inside the lib directory yet.
| -rw-r--r-- | Makefile | 28 | ||||
| -rw-r--r-- | lib/database-private.h (renamed from database-private.h) | 0 | ||||
| -rw-r--r-- | lib/database.cc (renamed from database.cc) | 0 | ||||
| -rw-r--r-- | lib/index.cc (renamed from index.cc) | 0 | ||||
| -rw-r--r-- | lib/libsha1.c (renamed from libsha1.c) | 0 | ||||
| -rw-r--r-- | lib/libsha1.h (renamed from libsha1.h) | 0 | ||||
| -rw-r--r-- | lib/message-file.c (renamed from message-file.c) | 0 | ||||
| -rw-r--r-- | lib/message.cc (renamed from message.cc) | 0 | ||||
| -rw-r--r-- | lib/notmuch-private.h (renamed from notmuch-private.h) | 0 | ||||
| -rw-r--r-- | lib/notmuch.h (renamed from notmuch.h) | 0 | ||||
| -rw-r--r-- | lib/query.cc (renamed from query.cc) | 0 | ||||
| -rw-r--r-- | lib/sha1.c (renamed from sha1.c) | 0 | ||||
| -rw-r--r-- | lib/tags.c (renamed from tags.c) | 0 | ||||
| -rw-r--r-- | lib/thread.cc (renamed from thread.cc) | 0 | ||||
| -rw-r--r-- | lib/xutil.c (renamed from xutil.c) | 0 | ||||
| -rw-r--r-- | lib/xutil.h (renamed from xutil.h) | 0 |
16 files changed, 14 insertions, 14 deletions
@@ -2,7 +2,7 @@ PROGS=notmuch WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum -NOTMUCH_DEPENDS_FLAGS=`pkg-config --cflags glib-2.0 gmime-2.4 talloc` +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` NOTMUCH_CFLAGS=$(WARN_FLAGS) -O0 -g $(NOTMUCH_DEPENDS_FLAGS) @@ -11,17 +11,17 @@ 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= \ - database.o \ - index.o \ - libsha1.o \ - message.o \ - message-file.o \ - query.o \ - sha1.o \ - tags.o \ - thread.o \ - xutil.o +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 @@ -37,7 +37,7 @@ all: $(PROGS) notmuch: $(MAIN) $(LIBRARY) $(CC) $(NOTMUCH_LDFLAGS) $^ -o $@ -Makefile.dep: *.c *.cc +Makefile.dep: *.c lib/*.c lib/*.cc $(CXX) -M $(CPPFLAGS) $(NOTMUCH_DEPENDS_FLAGS) \ $(NOTMUCH_CXX_DEPENDS_FLAGS) $^ > $@ -include Makefile.dep @@ -52,4 +52,4 @@ install: all notmuch.1.gz $(DESTDIR)/etc/bash_completion.d/notmuch clean: - rm -f $(PROGS) *.o Makefile.dep + rm -f $(PROGS) lib/*.o *.o Makefile.dep diff --git a/database-private.h b/lib/database-private.h index 76e26ce0..76e26ce0 100644 --- a/database-private.h +++ b/lib/database-private.h diff --git a/database.cc b/lib/database.cc index 4524016b..4524016b 100644 --- a/database.cc +++ b/lib/database.cc diff --git a/libsha1.c b/lib/libsha1.c index c39a5a17..c39a5a17 100644 --- a/libsha1.c +++ b/lib/libsha1.c diff --git a/libsha1.h b/lib/libsha1.h index b4dca93b..b4dca93b 100644 --- a/libsha1.h +++ b/lib/libsha1.h diff --git a/message-file.c b/lib/message-file.c index 75caba6d..75caba6d 100644 --- a/message-file.c +++ b/lib/message-file.c diff --git a/message.cc b/lib/message.cc index 28f19a88..28f19a88 100644 --- a/message.cc +++ b/lib/message.cc diff --git a/notmuch-private.h b/lib/notmuch-private.h index 92b46343..92b46343 100644 --- a/notmuch-private.h +++ b/lib/notmuch-private.h diff --git a/notmuch.h b/lib/notmuch.h index bab573dd..bab573dd 100644 --- a/notmuch.h +++ b/lib/notmuch.h diff --git a/thread.cc b/lib/thread.cc index b67dfade..b67dfade 100644 --- a/thread.cc +++ b/lib/thread.cc |