1 Return-Path: <teythoon@jade-hamburg.de>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id AEFB2431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 12:57:10 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id KnjuIgGNuu2a for <notmuch@notmuchmail.org>;
\r
16 Mon, 30 Apr 2012 12:57:08 -0700 (PDT)
\r
17 Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])
\r
18 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 1E254429E49
\r
21 for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 12:56:47 -0700 (PDT)
\r
22 Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])
\r
23 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
\r
24 (No client certificate requested)
\r
25 by mail.cryptobitch.de (Postfix) with ESMTPSA id 853E9584BA3
\r
26 for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 21:56:45 +0200 (CEST)
\r
27 Received: by mail.jade-hamburg.de (Postfix, from userid 401)
\r
28 id 07EBADF2A2; Mon, 30 Apr 2012 21:56:45 +0200 (CEST)
\r
29 Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])
\r
30 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
31 (No client certificate requested) (Authenticated sender: teythoon)
\r
32 by mail.jade-hamburg.de (Postfix) with ESMTPSA id A6306DF2A5;
\r
33 Mon, 30 Apr 2012 21:55:53 +0200 (CEST)
\r
34 Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)
\r
35 (envelope-from <teythoon@thinkbox.jade-hamburg.de>)
\r
36 id 1SOwhM-0003ys-8E; Mon, 30 Apr 2012 21:55:52 +0200
\r
37 From: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
38 To: notmuch@notmuchmail.org
\r
39 Subject: [PATCH 4/5] go: update the build system
\r
40 Date: Mon, 30 Apr 2012 21:55:43 +0200
\r
42 <1335815744-15258-4-git-send-email-4winter@informatik.uni-hamburg.de>
\r
43 X-Mailer: git-send-email 1.7.10
\r
45 <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
46 References: <20120430195420.2528.48612@thinkbox.jade-hamburg.de>
\r
47 <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de>
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Mon, 30 Apr 2012 19:57:11 -0000
\r
62 Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>
\r
64 bindings/go/Makefile | 51 ++++++++++++++++++++++++++-------------------
\r
65 bindings/go/cmds/Makefile | 11 ----------
\r
66 bindings/go/pkg/Makefile | 17 ---------------
\r
67 3 files changed, 30 insertions(+), 49 deletions(-)
\r
68 delete mode 100644 bindings/go/cmds/Makefile
\r
69 delete mode 100644 bindings/go/pkg/Makefile
\r
71 diff --git a/bindings/go/Makefile b/bindings/go/Makefile
\r
72 index aba2d59..c9a8dba 100644
\r
73 --- a/bindings/go/Makefile
\r
74 +++ b/bindings/go/Makefile
\r
76 -# Copyright 2009 The Go Authors. All rights reserved.
\r
77 -# Use of this source code is governed by a BSD-style
\r
78 -# license that can be found in the LICENSE file.
\r
79 +# Makefile for the go bindings of notmuch
\r
81 -include ${GOROOT}/src/Make.inc
\r
82 +GOPATH ?= $(shell pwd)
\r
92 +all: notmuch notmuch-addrlookup
\r
96 + $(GO) install notmuch
\r
98 -clean.dirs: $(addsuffix .clean, $(DIRS))
\r
99 -install.dirs: $(addsuffix .install, $(DIRS))
\r
100 -nuke.dirs: $(addsuffix .nuke, $(DIRS))
\r
101 -test.dirs: $(addsuffix .test, $(TEST))
\r
102 -bench.dirs: $(addsuffix .bench, $(BENCH))
\r
105 + if [ ! -d src/github.com/kless/goconfig/config ]; then \
\r
106 + $(GO) get github.com/kless/goconfig/config; \
\r
110 - +cd $* && $(QUOTED_GOBIN)/gomake clean
\r
111 +.PHONY: notmuch-addrlookup
\r
112 +notmuch-addrlookup: notmuch goconfig
\r
113 + $(GO) install notmuch-addrlookup
\r
116 - +cd $* && $(QUOTED_GOBIN)/gomake install
\r
119 + $(GOFMT) -w=true $(GOFMT_OPTS) src/notmuch
\r
120 + $(GOFMT) -w=true $(GOFMT_OPTS) src/notmuch-addrlookup
\r
123 +.PHONY: check-format
\r
125 + $(GOFMT) -d=true $(GOFMT_OPTS) src/notmuch
\r
126 + $(GOFMT) -d=true $(GOFMT_OPTS) src/notmuch-addrlookup
\r
128 -install: install.dirs
\r
130 -#-include ${GOROOT}/src/Make.deps
\r
133 + $(GO) clean notmuch
\r
134 + $(GO) clean notmuch-addrlookup
\r
136 diff --git a/bindings/go/cmds/Makefile b/bindings/go/cmds/Makefile
\r
137 deleted file mode 100644
\r
138 index afbc6d2..0000000
\r
139 --- a/bindings/go/cmds/Makefile
\r
142 -# Copyright 2009 The Go Authors. All rights reserved.
\r
143 -# Use of this source code is governed by a BSD-style
\r
144 -# license that can be found in the LICENSE file.
\r
146 -include ${GOROOT}/src/Make.inc
\r
148 -TARG=notmuch-addrlookup
\r
150 - notmuch-addrlookup.go
\r
152 -include ${GOROOT}/src/Make.cmd
\r
153 diff --git a/bindings/go/pkg/Makefile b/bindings/go/pkg/Makefile
\r
154 deleted file mode 100644
\r
155 index de89dbc..0000000
\r
156 --- a/bindings/go/pkg/Makefile
\r
159 -# Copyright 2009 The Go Authors. All rights reserved.
\r
160 -# Use of this source code is governed by a BSD-style
\r
161 -# license that can be found in the LICENSE file.
\r
163 -include $(GOROOT)/src/Make.inc
\r
166 -CGOFILES=notmuch.go
\r
167 -CGO_LDFLAGS=-lnotmuch
\r
169 -CLEANFILES+=notmuch_test
\r
171 -include $(GOROOT)/src/Make.pkg
\r
175 - $(LD) -o $@ $*.$O
\r