diff options
| author |  David Bremner <bremner@debian.org> | 2011-10-23 12:05:13 -0300 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2011-10-30 23:09:49 -0300 |
| commit | 1dedfc90f6eee7cad10f1a1ceb39a7a1c4dbd1b1 (patch) | |
| tree | 79cb128de2cf3a5249b2c31e0d319ed14134505e /lib/Makefile.local | |
| parent | a1ca7e8ebb49ee92ebe8e4abe3db27491d7bbddf (diff) | |
xutil.c: remove duplicate copies, create new library libutil.a to contain xutil.
We keep the lib/xutil.c version. As a consequence, also factor out
_internal_error and associated macros. It might be overkill to make a
new file error_util.c for this, but _internal_error does not really
belong in database.cc.
Diffstat (limited to 'lib/Makefile.local')
| -rw-r--r-- | lib/Makefile.local | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Makefile.local b/lib/Makefile.local index be51eaa1..d58552c4 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -54,8 +54,7 @@ libnotmuch_c_srcs = \ $(dir)/message-file.c \ $(dir)/messages.c \ $(dir)/sha1.c \ - $(dir)/tags.c \ - $(dir)/xutil.c + $(dir)/tags.c libnotmuch_cxx_srcs = \ $(dir)/database.cc \ @@ -71,7 +70,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) $(call quiet,AR) rcs $@ $^ $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym - $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ + $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ -L$(srcdir)/util -lutil notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules) sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@ |