From: Jani Nikula Date: Sat, 13 Oct 2012 22:09:51 +0000 (+0300) Subject: [PATCH v4 5/9] build: build parse-time-string as part of the notmuch lib and static cli X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1da4e41c203d25c50d258fea4ef70cdff9d45a3c;p=notmuch-archives.git [PATCH v4 5/9] build: build parse-time-string as part of the notmuch lib and static cli --- diff --git a/fe/ce892ba975115b4d11fe24734f84883dd8a009 b/fe/ce892ba975115b4d11fe24734f84883dd8a009 new file mode 100644 index 000000000..81be5dc89 --- /dev/null +++ b/fe/ce892ba975115b4d11fe24734f84883dd8a009 @@ -0,0 +1,103 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 12CDF431FC0 + for ; Sat, 13 Oct 2012 15:10:17 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id t8xhrxsfO3+6 for ; + Sat, 13 Oct 2012 15:10:16 -0700 (PDT) +Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com + [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C8790431FBD + for ; Sat, 13 Oct 2012 15:10:15 -0700 (PDT) +Received: by mail-lb0-f181.google.com with SMTP id gg6so2988019lbb.26 + for ; Sat, 13 Oct 2012 15:10:15 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=google.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references + :in-reply-to:references:x-gm-message-state; + bh=HwpiY6T7jx8Gb58MvTodHoiPCCGhZVtnFRuRbeGZ6SE=; + b=nwZJ8iWnF7haPRFOgCcy6RNt4nxkKNkwdNxA0ZCARomBnAVFkr7AwGr/aDgyNabY1v + iO3CaRDoOwDeMBTQI3Ud0NhtmF6YbkBdJUSJlwIbcwRmK/t0YhGuIgQoMD5mxQc4NkaY + cfgXwlJK1X0eDFc/dQRH23E8kCtfrDB7NemNprfGHtXtfOI/sYpHDjuJhMYl1QHkYOoy + IIgRDF+g1gQpZ5XhNU4z7axgnN/nDVQXndxRYpye4LHNEXWuVvlOikAmGE2IpfqcyOOk + LpbF8fIkJG45CJ3CT5fbYCVBuOXRospbh5kYWcyc/OW8kgsVawy9Dxaenk2WI6uy6NXT + jW9A== +Received: by 10.152.104.50 with SMTP id gb18mr6910894lab.9.1350166215448; + Sat, 13 Oct 2012 15:10:15 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id c6sm3277582lbn.1.2012.10.13.15.10.13 + (version=SSLv3 cipher=OTHER); Sat, 13 Oct 2012 15:10:14 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v4 5/9] build: build parse-time-string as part of the notmuch + lib and static cli +Date: Sun, 14 Oct 2012 01:09:51 +0300 +Message-Id: + <384ef475eff845c27ada3426f6559c1822f9b97c.1350164594.git.jani@nikula.org> +X-Mailer: git-send-email 1.7.9.5 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQku3XnAAceDsOMpqEoELOO9jzlAK1HzIfv3W11+81GYIpCJOi3ILKSrmDm3tJfLfHr5Hm5P +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 13 Oct 2012 22:10:17 -0000 + +--- + Makefile.local | 2 +- + lib/Makefile.local | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index 7f2d4f1..2b91946 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 8a9aa28..d1635cf 100644 +--- a/lib/Makefile.local ++++ b/lib/Makefile.local +@@ -70,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 $@ 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) > $@ +-- +1.7.9.5 +