[PATCH v2 03/11] svn-fe: add EXTLIBS needed for parse-options
- From
Dmitry Ivankov <divanorama@gmail.com>
- Date
- Jul 13, 2011, 12:21 UTC
- Message-ID
- <1310559673-5026-4-git-send-email-divanorama@gmail.com>
- In-Reply-To
- <1310559673-5026-1-git-send-email-divanorama@gmail.com>
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 <divanorama@gmail.com> --- 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