{"thread":{"id":"37439","subject":"[PATCH v2] contrib/svn-fe: fix Makefile","startedAt":"2014-08-28T17:00:49Z","lastAt":"2014-08-28T17:00:49Z","messageCount":1,"participants":["Maxim Bublis"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"248500","messageId":"1409245249-78610-1-git-send-email-satori@yandex-team.ru","threadId":"37439","inReplyTo":null,"subject":"[PATCH v2] contrib/svn-fe: fix Makefile","fromName":"Maxim Bublis","fromEmail":"satori@yandex-team.ru","sentAt":"2014-08-28T17:00:49Z","receivedAt":"2014-08-28T17:00:49Z","isPatch":true,"sender":{"key":"satori@yandex-team.ru","avatar":null},"body":"Fixes several problems:\n  * include config.mak.uname, config.mak.autogen and config.mak\n    in order to use settings for prefix and other such things;\n  * link xdiff/lib.a as it is a requirement for libgit.a;\n  * fix CFLAGS, LDFLAGS and EXTLIBS for Linux and Mac OS X.\n\nSigned-off-by: Maxim Bublis <satori@yandex-team.ru>\n---\nChanges from previous version:\n  * added possibility to disable MacPorts and Fink;\n  * respecting NEEDS_CRYPTO_WITH_SSL.\n contrib/svn-fe/Makefile | 60 +++++++++++++++++++++++++++++++++++++++++--------\n 1 file changed, 51 insertions(+), 9 deletions(-)\n\ndiff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile\nindex 360d8da..e8651aa 100644\n--- a/contrib/svn-fe/Makefile\n+++ b/contrib/svn-fe/Makefile\n@@ -1,18 +1,58 @@\n all:: svn-fe$X\n \n-CC = gcc\n+CC = cc\n RM = rm -f\n MV = mv\n \n CFLAGS = -g -O2 -Wall\n LDFLAGS =\n-ALL_CFLAGS = $(CFLAGS)\n-ALL_LDFLAGS = $(LDFLAGS)\n-EXTLIBS =\n+EXTLIBS = -lz\n+\n+include ../../config.mak.uname\n+-include ../../config.mak.autogen\n+-include ../../config.mak\n+\n+ifeq ($(uname_S),Darwin)\n+\tifndef NO_FINK\n+\t\tifeq ($(shell test -d /sw/lib && echo y),y)\n+\t\t\tCFLAGS += -I/sw/include\n+\t\t\tLDFLAGS += -L/sw/lib\n+\t\tendif\n+\tendif\n+\tifndef NO_DARWIN_PORTS\n+\t\tifeq ($(shell test -d /opt/local/lib && echo y),y)\n+\t\t\tCFLAGS += -I/opt/local/include\n+\t\t\tLDFLAGS += -L/opt/local/lib\n+\t\tendif\n+\tendif\n+endif\n+\n+ifndef NO_OPENSSL\n+\tEXTLIBS += -lssl\n+\tifdef NEEDS_CRYPTO_WITH_SSL\n+\t\tEXTLIBS += -lcrypto\n+\tendif\n+endif\n+\n+ifndef NO_PTHREADS\n+\tCFLAGS += $(PTHREADS_CFLAGS)\n+\tEXTLIBS += $(PTHREAD_LIBS)\n+endif\n+\n+ifdef HAVE_CLOCK_GETTIME\n+\tCFLAGS += -DHAVE_CLOCK_GETTIME\n+\tEXTLIBS += -lrt\n+endif\n+\n+ifdef NEEDS_LIBICONV\n+\tEXTLIBS += -liconv\n+endif\n \n GIT_LIB = ../../libgit.a\n VCSSVN_LIB = ../../vcs-svn/lib.a\n-LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(EXTLIBS)\n+XDIFF_LIB = ../../xdiff/lib.a\n+\n+LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(XDIFF_LIB)\n \n QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir\n QUIET_SUBDIR1 =\n@@ -33,12 +73,11 @@ ifndef V\n endif\n endif\n \n-svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(GIT_LIB)\n-\t$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ svn-fe.o \\\n-\t\t$(ALL_LDFLAGS) $(LIBS)\n+svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(XDIFF_LIB) $(GIT_LIB)\n+\t$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(EXTLIBS) -o $@ svn-fe.o $(LIBS)\n \n svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h\n-\t$(QUIET_CC)$(CC) -I../../vcs-svn -o $*.o -c $(ALL_CFLAGS) $<\n+\t$(QUIET_CC)$(CC) $(CFLAGS) -I../../vcs-svn -o $*.o -c $<\n \n svn-fe.html: svn-fe.txt\n \t$(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \\\n@@ -54,6 +93,9 @@ svn-fe.1: svn-fe.txt\n ../../vcs-svn/lib.a: FORCE\n \t$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) vcs-svn/lib.a\n \n+../../xdiff/lib.a: FORCE\n+\t$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) xdiff/lib.a\n+\n ../../libgit.a: FORCE\n \t$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) libgit.a\n \n-- \n1.8.5.2 (Apple Git-48)\n"}]}