From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Ivankov Subject: [PATCH v2 03/11] svn-fe: add EXTLIBS needed for parse-options Date: Wed, 13 Jul 2011 18:21:05 +0600 Message-ID: <1310559673-5026-4-git-send-email-divanorama@gmail.com> References: <1310559673-5026-1-git-send-email-divanorama@gmail.com> Cc: Jonathan Nieder , David Barr , Ramkumar Ramachandra , Dmitry Ivankov To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Jul 13 14:21:01 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QgyR2-0004Ap-74 for gcvg-git-2@lo.gmane.org; Wed, 13 Jul 2011 14:21:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752002Ab1GMMU6 (ORCPT ); Wed, 13 Jul 2011 08:20:58 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:35552 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889Ab1GMMU4 (ORCPT ); Wed, 13 Jul 2011 08:20:56 -0400 Received: by mail-bw0-f46.google.com with SMTP id 5so4787045bwd.19 for ; Wed, 13 Jul 2011 05:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=WDm6ENx8dBbp1xELZgdtIfYKpO6n4iMC7Tj0BUjyYQo=; b=DFaFcLqr/uxvtgFQld+51wkZ4LUnC2LX+zncJMI6BQ0HOLPjp5lO+1pTeJYjfx89NH jY6mzFBTmXyKVSJpuVYaCyrncDmqPUQBnyt3MEqTTXN4XYxj45xwUjw6ZeRCWd7cvuRw aPyRQWr3DTZacO3U/vR0rqnm0Aq9/ydXKq7rE= Received: by 10.204.188.1 with SMTP id cy1mr543840bkb.64.1310559656191; Wed, 13 Jul 2011 05:20:56 -0700 (PDT) Received: from localhost.localdomain (117360277.convex.ru [79.172.62.237]) by mx.google.com with ESMTPS id c8sm1653987bkc.15.2011.07.13.05.20.54 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 13 Jul 2011 05:20:55 -0700 (PDT) X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1310559673-5026-1-git-send-email-divanorama@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Currently parse-options.o pull quite a big bunch of dependencies that are neither pulled in by svn-fe Makefile nor included in libgit.a. Use a temporary hack: put hardcoded EXTLIBS, this may not work in all setups because /Makefile logic is not repeated. For example, one may need -lcrypto instead of -lssl or no crypto library if BLK_SHA1 is set, also an additional -lz or -lpcre could be required. Signed-off-by: Dmitry Ivankov --- contrib/svn-fe/Makefile | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile index bc03a3e..bf1625c 100644 --- a/contrib/svn-fe/Makefile +++ b/contrib/svn-fe/Makefile @@ -8,11 +8,12 @@ CFLAGS = -g -O2 -Wall LDFLAGS = ALL_CFLAGS = $(CFLAGS) ALL_LDFLAGS = $(LDFLAGS) -EXTLIBS = +EXTLIBS = -lssl -lpthread GIT_LIB = ../../libgit.a VCSSVN_LIB = ../../vcs-svn/lib.a -LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(EXTLIBS) +XDIFF_LIB = ../../xdiff/lib.a +LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(XDIFF_LIB) $(EXTLIBS) QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR1 = @@ -53,11 +54,8 @@ svn-fe.1: svn-fe.txt ../contrib/svn-fe/$@ $(MV) ../../Documentation/svn-fe.1 . -../../vcs-svn/lib.a: FORCE - $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) vcs-svn/lib.a - -../../libgit.a: FORCE - $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) libgit.a +$(VCSSVN_LIB) $(GIT_LIB) $(XDIFF_LIB): ../../%.a: FORCE + $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $*.a clean: $(RM) svn-fe$X svn-fe.o svn-fe.html svn-fe.xml svn-fe.1 -- 1.7.3.4