From 6594190291ad74e4d2ab63ff17aa0854138cf246 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 13 Sep 2012 00:27:22 +0300 Subject: [PATCH] [PATCH v3 5/9] build: build parse-time-string as part of the notmuch lib and static cli --- fb/bfb27193df32955f9755acd03d2d5f77a37a7f | 104 ++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 fb/bfb27193df32955f9755acd03d2d5f77a37a7f diff --git a/fb/bfb27193df32955f9755acd03d2d5f77a37a7f b/fb/bfb27193df32955f9755acd03d2d5f77a37a7f new file mode 100644 index 000000000..58535955d --- /dev/null +++ b/fb/bfb27193df32955f9755acd03d2d5f77a37a7f @@ -0,0 +1,104 @@ +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 A70A7431FC2 + for ; Wed, 12 Sep 2012 14:27:54 -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 A-XPHFOjxtUD for ; + Wed, 12 Sep 2012 14:27:53 -0700 (PDT) +Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com + [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id A2A4C431FCB + for ; Wed, 12 Sep 2012 14:27:49 -0700 (PDT) +Received: by mail-lpp01m010-f53.google.com with SMTP id c1so1533671lah.26 + for ; Wed, 12 Sep 2012 14:27:49 -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=L94hLdLD7DUFyxbpgH0M0oaETH3LE9A4tmlGTuuyJcSw45QRfcArrtuj8KNEtYYV7i + yvBkOAnOUXM8OMNmdMlT0I5D4bHWsug0fSwd96DUsiMivUMWO+gXNv4Qt1pYcz4XNm2Y + ORYQ4wMzhvm7UEnZZJB2SFSAYTrKA+lqA/2wLzXMFMR+w2mjcruHlpowKeM08YoWdLfh + t7WHNwlDTbMGkOotP+uWSASy6G053jlM5xkQc53iIerfI/I5pGlixqWlO9J/aJP8N5e6 + 863+Txlg0TJAa0sz+4d1wOqF+l/MxaRD+8z6rpiDAGicx0OX8byNIOhY89GjouCuXV+l + /Zcw== +Received: by 10.152.103.244 with SMTP id fz20mr20447554lab.54.1347485269233; + Wed, 12 Sep 2012 14:27:49 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id hz16sm21230581lab.6.2012.09.12.14.27.47 + (version=SSLv3 cipher=OTHER); Wed, 12 Sep 2012 14:27:48 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org, + David Bremner +Subject: [PATCH v3 5/9] build: build parse-time-string as part of the notmuch + lib and static cli +Date: Thu, 13 Sep 2012 00:27:22 +0300 +Message-Id: + +X-Mailer: git-send-email 1.7.9.5 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQmB1u6f7SlhsK2e1AcceOnqgkwBlMQdPDs/yr7uWvw4h5Bnvo9msau7UWlQaW1loD6p1HUi +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: Wed, 12 Sep 2012 21:27:55 -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 + -- 2.26.2