| -rw-r--r-- | Makefile | 28 |
1 files changed, 24 insertions, 4 deletions
@@ -13,4 +13,12 @@ INSTALL = install # +# 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. +# @@ -70,3 +78,3 @@ endif -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread OBJECTS = @@ -92,2 +100,3 @@ OBJECTS += ui-shared.o OBJECTS += ui-snapshot.o +OBJECTS += ui-ssdiff.o OBJECTS += ui-stats.o @@ -125,2 +134,11 @@ ifdef NO_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 @@ -131,7 +149,9 @@ 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 |