Re: [PATCH] contrib/svn-fe: fix Makefile

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08/26/2014 02:44 PM, Maxim Bublis wrote:
Fixes several problems:
   * include config.mak.uname, config.mak.autogen and config.mak
     in order to use settings for prefix and other such things;
   * link xdiff/lib.a as it is a requirement for libgit.a;
   * fix CFLAGS and EXTLIBS for Linux and Mac OS X.
---
  contrib/svn-fe/Makefile | 47 ++++++++++++++++++++++++++++++++++++++---------
  1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile
index 360d8da..8e1d622 100644
--- a/contrib/svn-fe/Makefile
+++ b/contrib/svn-fe/Makefile
@@ -1,18 +1,45 @@
  all:: svn-fe$X
-CC = gcc
+CC = cc
  RM = rm -f
  MV = mv
CFLAGS = -g -O2 -Wall
  LDFLAGS =
-ALL_CFLAGS = $(CFLAGS)
-ALL_LDFLAGS = $(LDFLAGS)
-EXTLIBS =
+EXTLIBS = -lz
+
+include ../../config.mak.uname
+-include ../../config.mak.autogen
+-include ../../config.mak
+
+ifeq ($(uname_S),Darwin)
+	CFLAGS += -I/opt/local/include
+	LDFLAGS += -L/opt/local/lib
+endif
+
Should it be possible to disable this by using NO_DARWIN_PORTS
like we do in the main Makefile ?

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]