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 6CCFA41733B for ; Sun, 11 Apr 2010 16:45:05 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham 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 Ah7VyrAwcZ7N for ; Sun, 11 Apr 2010 16:45:04 -0700 (PDT) Received: from qw-out-1920.google.com (qw-out-1920.google.com [74.125.92.148]) by olra.theworths.org (Postfix) with ESMTP id DC835418C38 for ; Sun, 11 Apr 2010 16:45:02 -0700 (PDT) Received: by qw-out-1920.google.com with SMTP id 5so1634849qwc.32 for ; Sun, 11 Apr 2010 16:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=tHC7OKwvBZh8TE+8Jy+u4nhGcw0G4Omh41RNj5y1YsM=; b=egh8mSJP9ab2k/o/RLwXZD8u1P0I1poAxqf3+6sVk5+omJIV+mjJ/bQUGxIP5xqSjT 5D4k8ZGwbsio8k/lbx3sQS0MIWa2gEC6UKnFAW75zu/RMspTLkQwid+5mXsuTYW5VgP2 dgB5NjQ1Dt04q0NEK0/PHhG58OxXpUGfqxs6s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=U7iT1xw4xFQVXZUJW52MPbUgphSqE+cg6lL8tLlxhGiW6GmlONhysFb9x2Xm593qUN Z5JFwUKKCrY/q1Jop6SgwbPjwVBDtCLr3tha3WOV2U2CiODKUExFt+6nN4YADCl1PZGF HfCx2A+e/J559+wRJasBjdOcfndz1b6FiaoNI= Received: by 10.224.93.203 with SMTP id w11mr1140634qam.335.1271029502678; Sun, 11 Apr 2010 16:45:02 -0700 (PDT) Received: from localhost.localdomain (vpm120.wireless-resnet.upenn.edu [165.123.236.140]) by mx.google.com with ESMTPS id 8sm7425346qwj.50.2010.04.11.16.45.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 11 Apr 2010 16:45:02 -0700 (PDT) From: Aaron Ecay To: notmuch@notmuchmail.org Subject: [PATCH 2/4] Fix up Makefile for build. Date: Sun, 11 Apr 2010 19:44:52 -0400 Message-Id: <1271029494-89014-2-git-send-email-aaronecay@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <4bc25ea0.86c3f10a.45a3.ffff80d3@mx.google.com> References: <4bc25ea0.86c3f10a.45a3.ffff80d3@mx.google.com> 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, 11 Apr 2010 23:45:05 -0000 Must set extra_c(xx)flags before including subdir Makefile.local's, so that there is a blank slate that the subdirs can add on to. Must include subdir Makefile.local's before global one, otherwise the compat sources are not added to the list of those to be compiled. Signed-off-by: Aaron Ecay --- Makefile | 9 ++++++++- Makefile.local | 5 ----- compat/Makefile.local | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 076efc7..faaaec6 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,13 @@ subdirs = compat completion emacs lib global_deps = Makefile Makefile.local \ $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local) +# Sub-directory Makefile.local fragments can append to these variables +# to have directory-specific cflags as necessary. + +extra_cflags := +extra_cxxflags := + # Finally, include all of the Makefile.local fragments where all the # real work is done. -include Makefile.local $(subdirs:%=%/Makefile.local) + +include $(subdirs:%=%/Makefile.local) Makefile.local diff --git a/Makefile.local b/Makefile.local index 9e753cd..c04044c 100644 --- a/Makefile.local +++ b/Makefile.local @@ -33,11 +33,6 @@ Makefile.config: configure @echo "" ./configure -# Sub-directory Makefile.local fragments can append to these variables -# to have directory-specific cflags as necessary. -extra_cflags := -extra_cxxflags := - # Smash together user's values with our extra values FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) diff --git a/compat/Makefile.local b/compat/Makefile.local index 81e6c70..50f6cd1 100644 --- a/compat/Makefile.local +++ b/compat/Makefile.local @@ -3,7 +3,7 @@ dir := compat extra_cflags += -I$(dir) -notmuch_compat_srcs = +notmuch_compat_srcs := ifneq ($(HAVE_GETLINE),1) notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c -- 1.7.0.4