From ee6ee895a42696e699a2e74b27397a7790fa403a Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Tue, 30 Oct 2012 22:32:36 +0200 Subject: [PATCH] [PATCH v6 5/9] build: build parse-time-string as part of the notmuch lib and static cli --- 0d/998e061eea4d099909c3389edf3d21f1d69826 | 103 ++++++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 0d/998e061eea4d099909c3389edf3d21f1d69826 diff --git a/0d/998e061eea4d099909c3389edf3d21f1d69826 b/0d/998e061eea4d099909c3389edf3d21f1d69826 new file mode 100644 index 000000000..7a8098714 --- /dev/null +++ b/0d/998e061eea4d099909c3389edf3d21f1d69826 @@ -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 80E8E431FC3 + for ; Tue, 30 Oct 2012 13:33:18 -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 CZ49PAOxcYcG for ; + Tue, 30 Oct 2012 13:33:17 -0700 (PDT) +Received: from mail-la0-f53.google.com (mail-la0-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 5D957431FC0 + for ; Tue, 30 Oct 2012 13:33:02 -0700 (PDT) +Received: by mail-la0-f53.google.com with SMTP id l5so545085lah.26 + for ; Tue, 30 Oct 2012 13:33:01 -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=+z9JYl9HHkQrdg6MLibD3YQ2xpDuYt7DX2MaOTmutgI=; + b=aTXNsCB/ygZ5dBlmHlYO9QMMz6AZSAcgz2NH+tP9amslRwyS1vRmeEXri/8zzqBxrA + ZcdVhssOOlJaI2/xzPzh+4pNU2WQndGTVF/GogX7sK5fcFG1oqaMizmUdm+bGTOYuFVD + gYzPY7tzqUP7X7vJQUrt8OSaFxkO1MQwj3gE9pf5XQiE3ThQaROVBDcldmdboiK7Hb/9 + j46Gzy+u4Mh/4LDAA1WwbjF1wRXdTx27IjHdsmJTetxyVh2574h1YAiBMdK4j4BcoJ7k + ouuQSylLGqQKAIBcGEQr7z+IuKUMrj3U57hmzoFLs40M5IP1X9QZn7bFWVfwc/DBWgzU + c9lA== +Received: by 10.112.100.164 with SMTP id ez4mr12863734lbb.106.1351629181690; + Tue, 30 Oct 2012 13:33:01 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id sx3sm664147lab.9.2012.10.30.13.33.00 + (version=SSLv3 cipher=OTHER); Tue, 30 Oct 2012 13:33:00 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v6 5/9] build: build parse-time-string as part of the notmuch + lib and static cli +Date: Tue, 30 Oct 2012 22:32:36 +0200 +Message-Id: + <3204189203446ab80f9ef71c9af0fe98c1bde038.1351626272.git.jani@nikula.org> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQkBPUPXA9ap2pTOWm9ak1NGHYLqGppUHKWj/UU+iNk2U8/Bk3qCaP3xY8r7tfZtv9KuN0zp +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: Tue, 30 Oct 2012 20:33:18 -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 34e998f..62d76b2 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) > $@ +-- +1.7.10.4 + -- 2.26.2