X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/a75968df103a938656599e0d2d9fd1ab4de5ea8a..31665579c2779669c0cc56b8eb63f162b7e165df:/Makefile

diff --git a/Makefile b/Makefile
index a1f961b..036fcd7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,32 @@
-CGIT_VERSION = v0.7.2
+CGIT_VERSION = v0.8.1
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.5.6
+GIT_VER = 1.6.1
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
+# Define NO_STRCASESTR if you don't have strcasestr.
+#
+# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin).
+#
+
+#-include config.mak
+
+#
+# Platform specific tweaks
+#
+
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
+uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
+uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
+
+ifeq ($(uname_O),Cygwin)
+	NO_STRCASESTR = YesPlease
+	NEEDS_LIBICONV = YesPlease
+endif
+
 #
 # Let the user override the above settings.
 #
@@ -54,12 +74,16 @@ OBJECTS += cmd.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
+OBJECTS += scan-tree.o
 OBJECTS += shared.o
+OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
+OBJECTS += ui-clone.o
 OBJECTS += ui-commit.o
 OBJECTS += ui-diff.o
 OBJECTS += ui-log.o
 OBJECTS += ui-patch.o
+OBJECTS += ui-plain.o
 OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
@@ -73,7 +97,7 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all git test install clean distclean emptycache force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git
 
 all: cgit
 
@@ -89,21 +113,23 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+ifdef NO_ICONV
+	CFLAGS += -DNO_ICONV
+endif
+ifdef NO_STRCASESTR
+	CFLAGS += -DNO_STRCASESTR
+endif
 
-cgit: $(OBJECTS)
-	$(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
-
-$(OBJECTS): | git/xdiff/lib.a git/libgit.a
+cgit: $(OBJECTS) libgit
+	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
-git/xdiff/lib.a, git/libgit.a: git
-
-git:
-	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
-	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
+libgit:
+	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
+	$(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
 
 test: all
 	$(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
@@ -111,8 +137,8 @@ test: all
 install: all
 	mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
 	install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
-	install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
-	install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+	install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
+	install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
 
 uninstall:
 	rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
@@ -122,12 +148,5 @@ uninstall:
 clean:
 	rm -f cgit VERSION *.o *.d
 
-distclean: clean
-	git clean -d -x
-	cd git && git clean -d -x
-
-emptycache:
-	rm -rf $(DESTDIR)$(CACHE_ROOT)/*
-
 get-git:
 	curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git