[PATCH 4/5] go: update the build system

diff --git a/d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8 b/d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8
new file mode 100644 (file)
index 0000000..fa39a99
--- /dev/null
+++ b/d3/18f6d58d0cb0bb101716a0af557c98a2ee52a8
@@ -0,0 +1,178 @@
+Return-Path: <teythoon@jade-hamburg.de>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id AEFB2431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 12:57:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id KnjuIgGNuu2a for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Apr 2012 12:57:08 -0700 (PDT)\r
+Received: from mail.cryptobitch.de (cryptobitch.de [88.198.7.68])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1E254429E49\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 12:56:47 -0700 (PDT)\r
+Received: from mail.jade-hamburg.de (mail.jade-hamburg.de [85.183.11.228])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by mail.cryptobitch.de (Postfix) with ESMTPSA id 853E9584BA3\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Apr 2012 21:56:45 +0200 (CEST)\r
+Received: by mail.jade-hamburg.de (Postfix, from userid 401)\r
+       id 07EBADF2A2; Mon, 30 Apr 2012 21:56:45 +0200 (CEST)\r
+Received: from thinkbox.jade-hamburg.de (unknown [10.1.1.153])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested) (Authenticated sender: teythoon)\r
+       by mail.jade-hamburg.de (Postfix) with ESMTPSA id A6306DF2A5;\r
+       Mon, 30 Apr 2012 21:55:53 +0200 (CEST)\r
+Received: from teythoon by thinkbox.jade-hamburg.de with local (Exim 4.77)\r
+       (envelope-from <teythoon@thinkbox.jade-hamburg.de>)\r
+       id 1SOwhM-0003ys-8E; Mon, 30 Apr 2012 21:55:52 +0200\r
+From: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/5] go: update the build system\r
+Date: Mon, 30 Apr 2012 21:55:43 +0200\r
+Message-Id:\r
+ <1335815744-15258-4-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To:\r
+ <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+References: <20120430195420.2528.48612@thinkbox.jade-hamburg.de>\r
+       <1335815744-15258-1-git-send-email-4winter@informatik.uni-hamburg.de>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 30 Apr 2012 19:57:11 -0000\r
+\r
+Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>\r
+---\r
+ bindings/go/Makefile      |   51 ++++++++++++++++++++++++++-------------------\r
+ bindings/go/cmds/Makefile |   11 ----------\r
+ bindings/go/pkg/Makefile  |   17 ---------------\r
+ 3 files changed, 30 insertions(+), 49 deletions(-)\r
+ delete mode 100644 bindings/go/cmds/Makefile\r
+ delete mode 100644 bindings/go/pkg/Makefile\r
+\r
+diff --git a/bindings/go/Makefile b/bindings/go/Makefile\r
+index aba2d59..c9a8dba 100644\r
+--- a/bindings/go/Makefile\r
++++ b/bindings/go/Makefile\r
+@@ -1,30 +1,39 @@\r
+-# Copyright 2009 The Go Authors. All rights reserved.\r
+-# Use of this source code is governed by a BSD-style\r
+-# license that can be found in the LICENSE file.\r
++# Makefile for the go bindings of notmuch\r
+ \r
+-include ${GOROOT}/src/Make.inc\r
++GOPATH     ?= $(shell pwd)\r
++export GOPATH\r
+ \r
+-all: install\r
++GO         ?= go\r
++GOFMT      ?= gofmt\r
+ \r
+-DIRS=\\r
+-        pkg\\r
+-        cmds\\r
++all: notmuch notmuch-addrlookup\r
+ \r
++.PHONY: notmuch\r
++notmuch:\r
++      $(GO) install notmuch\r
+ \r
+-clean.dirs: $(addsuffix .clean, $(DIRS))\r
+-install.dirs: $(addsuffix .install, $(DIRS))\r
+-nuke.dirs: $(addsuffix .nuke, $(DIRS))\r
+-test.dirs: $(addsuffix .test, $(TEST))\r
+-bench.dirs: $(addsuffix .bench, $(BENCH))\r
++.PHONY: goconfig\r
++goconfig:\r
++      if [ ! -d src/github.com/kless/goconfig/config ]; then \\r
++          $(GO) get github.com/kless/goconfig/config; \\r
++      fi\r
+ \r
+-%.clean:\r
+-      +cd $* && $(QUOTED_GOBIN)/gomake clean\r
++.PHONY: notmuch-addrlookup\r
++notmuch-addrlookup: notmuch goconfig\r
++      $(GO) install notmuch-addrlookup\r
+ \r
+-%.install:\r
+-      +cd $* && $(QUOTED_GOBIN)/gomake install\r
++.PHONY: format\r
++format:\r
++      $(GOFMT) -w=true $(GOFMT_OPTS) src/notmuch\r
++      $(GOFMT) -w=true $(GOFMT_OPTS) src/notmuch-addrlookup\r
+ \r
+-clean: clean.dirs\r
++.PHONY: check-format\r
++check-format:\r
++      $(GOFMT) -d=true $(GOFMT_OPTS) src/notmuch\r
++      $(GOFMT) -d=true $(GOFMT_OPTS) src/notmuch-addrlookup\r
+ \r
+-install: install.dirs\r
+-\r
+-#-include ${GOROOT}/src/Make.deps\r
++.PHONY: clean\r
++clean:\r
++      $(GO) clean notmuch\r
++      $(GO) clean notmuch-addrlookup\r
++      rm -rf pkg bin\r
+diff --git a/bindings/go/cmds/Makefile b/bindings/go/cmds/Makefile\r
+deleted file mode 100644\r
+index afbc6d2..0000000\r
+--- a/bindings/go/cmds/Makefile\r
++++ /dev/null\r
+@@ -1,11 +0,0 @@\r
+-# Copyright 2009 The Go Authors. All rights reserved.\r
+-# Use of this source code is governed by a BSD-style\r
+-# license that can be found in the LICENSE file.\r
+-\r
+-include ${GOROOT}/src/Make.inc\r
+-\r
+-TARG=notmuch-addrlookup\r
+-GOFILES=\\r
+-      notmuch-addrlookup.go\r
+-\r
+-include ${GOROOT}/src/Make.cmd\r
+diff --git a/bindings/go/pkg/Makefile b/bindings/go/pkg/Makefile\r
+deleted file mode 100644\r
+index de89dbc..0000000\r
+--- a/bindings/go/pkg/Makefile\r
++++ /dev/null\r
+@@ -1,17 +0,0 @@\r
+-# Copyright 2009 The Go Authors.  All rights reserved.\r
+-# Use of this source code is governed by a BSD-style\r
+-# license that can be found in the LICENSE file.\r
+-\r
+-include $(GOROOT)/src/Make.inc\r
+-\r
+-TARG=notmuch\r
+-CGOFILES=notmuch.go\r
+-CGO_LDFLAGS=-lnotmuch\r
+-\r
+-CLEANFILES+=notmuch_test\r
+-\r
+-include $(GOROOT)/src/Make.pkg\r
+-\r
+-%: install %.go\r
+-      $(GC) $*.go\r
+-      $(LD) -o $@ $*.$O\r
+-- \r
+1.7.10\r
+\r