From: Jani Nikula Date: Sun, 21 Oct 2012 21:22:28 +0000 (+0300) Subject: [PATCH v5 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=1be51aff07221c700a86cab6f59f61c2a36e0f46;p=notmuch-archives.git [PATCH v5 5/9] build: build parse-time-string as part of the notmuch lib and static cli --- diff --git a/65/25c3a93b2ad5820c86157c322998fe8589a5b9 b/65/25c3a93b2ad5820c86157c322998fe8589a5b9 new file mode 100644 index 000000000..18c447bf6 --- /dev/null +++ b/65/25c3a93b2ad5820c86157c322998fe8589a5b9 @@ -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 C5DEB431FBD + for ; Sun, 21 Oct 2012 14:22: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 8cg4o6oUUk43 for ; + Sun, 21 Oct 2012 14:22:53 -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 510AE431FC9 + for ; Sun, 21 Oct 2012 14:22:52 -0700 (PDT) +Received: by mail-la0-f53.google.com with SMTP id l5so1455559lah.26 + for ; Sun, 21 Oct 2012 14:22:52 -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=AJqM7rq3gSIZ/b8YlI6SFdVNApJgJFEe/yQw9r1WFhI=; + b=mdoKHyXWVNZbTcWS8t1siYP/lqDWrlAaMQNRLrnqI8QX9j7i51JIW8JIw0SP11u0Fr + WjxY8UFS8zzTf68KOf8tFKKJDDZ8q4DI4tb7jnWbNOP5JcCXsBv5UZg5kT2VZ2iGPROp + qXWySnGPOKtp2uGOYLIyH++yZNGK44Ye8N9LJgbuOJ4+ux7e3fpvnGLTJlksVZhKDUIj + cUcJ51NFIjHRNI2iLczJQt3vKCvn67eTZP3Tb1gUQ8nD+wo6tpmZx52iuZCMNV+Ckqsu + xXWoV/WG1QlxVwiuIVCGjct5GWWRWz+smfnq044luSEFGkJxagHz7wk/yZgE70P12HS6 + MbBA== +Received: by 10.112.36.65 with SMTP id o1mr2930237lbj.11.1350854571934; + Sun, 21 Oct 2012 14:22:51 -0700 (PDT) +Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi. + [80.223.81.27]) + by mx.google.com with ESMTPS id y10sm2494431lbg.4.2012.10.21.14.22.50 + (version=SSLv3 cipher=OTHER); Sun, 21 Oct 2012 14:22:51 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Subject: [PATCH v5 5/9] build: build parse-time-string as part of the notmuch + lib and static cli +Date: Mon, 22 Oct 2012 00:22:28 +0300 +Message-Id: + +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: +References: +In-Reply-To: +References: +X-Gm-Message-State: + ALoCoQkl6dDF5+rYWMmYnXOszpYIYBwGqfKYL2uIsT7CZio0peW+MCWSZcOFB6Ej83BrtvdKRwG0 +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: Sun, 21 Oct 2012 21:22: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.10.4 +