From: Jani Nikula <jani@nikula.org>
Date: Tue, 30 Oct 2012 20:32:36 +0000 (+0200)
Subject: build: build parse-time-string as part of the notmuch lib and static cli
X-Git-Tag: 0.15_rc1~194
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=af6b4b29f97b1f457bb7220491bf37536e1b9d7a;ds=sidebyside

build: build parse-time-string as part of the notmuch lib and static cli
---

diff --git a/Makefile.local b/Makefile.local
index 7f2d4f13..2b919465 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -277,7 +277,7 @@ notmuch_client_srcs =		\
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 
-notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a
 	$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
 
 notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
diff --git a/lib/Makefile.local b/lib/Makefile.local
index 34e998f8..62d76b22 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -73,7 +73,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 $@ util/libutil.a
+	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a parse-time-string/libparse-time-string.a
 
 notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
 	sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@