From: Lars Hjemli <hjemli@gmail.com>
Date: Mon, 27 Sep 2010 06:03:30 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/d41b2ddcb331caa74c1a90a0253f234142848552?hp=-c

Merge branch 'stable'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---

d41b2ddcb331caa74c1a90a0253f234142848552
diff --combined Makefile
index 6a47ed2,2dae3ac..dda743d
--- a/Makefile
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- CGIT_VERSION = v0.8.3.3
+ CGIT_VERSION = v0.8.3.4
  CGIT_SCRIPT_NAME = cgit.cgi
  CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
  CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
@@@ -11,16 -11,8 +11,16 @@@ INSTALL = instal
  
  # Define NO_STRCASESTR if you don't have strcasestr.
  #
 +# Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1
 +# implementation (slower).
 +#
  # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
  #
 +# Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.)
 +# do not support the 'size specifiers' introduced by C99, namely ll, hh,
 +# j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t).
 +# some C compilers supported these specifiers prior to C99 as an extension.
 +#
  
  #-include config.mak
  
@@@ -76,7 -68,7 +76,7 @@@ endi
  	$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
  
  
 -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread
 +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread
  OBJECTS =
  OBJECTS += cache.o
  OBJECTS += cgit.o
@@@ -98,7 -90,6 +98,7 @@@ OBJECTS += ui-refs.
  OBJECTS += ui-repolist.o
  OBJECTS += ui-shared.o
  OBJECTS += ui-snapshot.o
 +OBJECTS += ui-ssdiff.o
  OBJECTS += ui-stats.o
  OBJECTS += ui-summary.o
  OBJECTS += ui-tag.o
@@@ -132,28 -123,17 +132,28 @@@ endi
  ifdef NO_STRCASESTR
  	CFLAGS += -DNO_STRCASESTR
  endif
 +ifdef NO_C99_FORMAT
 +	CFLAGS += -DNO_C99_FORMAT
 +endif
 +ifdef NO_OPENSSL
 +	CFLAGS += -DNO_OPENSSL
 +	GIT_OPTIONS += NO_OPENSSL=1
 +else
 +	EXTLIBS += -lcrypto
 +endif
  
  cgit: $(OBJECTS) libgit
  	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
  
  cgit.o: VERSION
  
 --include $(OBJECTS:.o=.d)
 +ifneq "$(MAKECMDGOALS)" "clean"
 +  -include $(OBJECTS:.o=.d)
 +endif
  
  libgit:
 -	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
 -	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
 +	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a
 +	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a
  
  test: all
  	$(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all