X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/e903011c4457c24c0095f270ca5e78c40729434f..4e7e8bf9616661bec0c9b9d9c50aca03e600f32b:/Makefile

diff --git a/Makefile b/Makefile
index aa7146d..fcbe3e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,84 +1,71 @@
-CGIT_VERSION = 0.4
+CGIT_VERSION = v0.5
+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.2
+GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
-prefix = /var/www/htdocs/cgit
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
 
-SHA1_HEADER = <openssl/sha.h>
-CACHE_ROOT = /var/cache/cgit
-CGIT_CONFIG = /etc/cgitrc
-CGIT_SCRIPT_NAME = cgit.cgi
 
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
-	ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \
-	ui-snapshot.o ui-blob.o
+	ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
+	ui-snapshot.o ui-blob.o ui-tag.o
+
 
-CFLAGS += -Wall
+.PHONY: all git install clean distclean force-version get-git
 
-ifdef DEBUG
-	CFLAGS += -g
-endif
+all: cgit git
 
-CFLAGS += -Igit
+VERSION: force-version
+	@./gen-version.sh "$(CGIT_VERSION)"
+-include VERSION
+
+
+CFLAGS += -g -Wall -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 
 
-#
-# If make is run on a nongit platform, we need to get the git sources as a tarball.
-# But there is currently no recent enough tarball available on kernel.org, so download
-# a zipfile from hjemli.net instead
-#
-GITVER = $(shell git version 2>/dev/null || echo nogit)
-ifeq ($(GITVER),nogit)
-GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2
-INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip)
-else
-INITGIT = ./submodules.sh -i
-endif
-
-
-#
-# basic build rules
-#
-all: cgit
-
-cgit: cgit.c cgit.h $(OBJECTS)
+cgit: cgit.c $(OBJECTS)
 	$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): cgit.h git/libgit.a
-
-git/libgit.a:
-	$(INITGIT)
-	$(MAKE) -C git
+$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
 
-#
-# phony targets
-#
-install: all clean-cache
-	mkdir -p $(prefix)
-	install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
-	install cgit.css $(prefix)/cgit.css
+git/xdiff/lib.a: | git
 
-clean-cgit:
-	rm -f cgit *.o
-
-distclean-cgit: clean-cgit
-	git clean -d -x
+git/libgit.a: | git
 
-clean-sub:
-	$(MAKE) -C git clean
+git:
+	cd git && $(MAKE) xdiff/lib.a
+	cd git && $(MAKE) libgit.a
 
-distclean-sub: clean-sub
-	$(shell cd git && git clean -d -x)
-
-clean-cache:
+install: all
+	mkdir -p $(CGIT_SCRIPT_PATH)
+	install cgit $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+	install cgit.css $(CGIT_SCRIPT_PATH)/cgit.css
 	rm -rf $(CACHE_ROOT)/*
 
-clean: clean-cgit clean-sub
+uninstall:
+	rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+	rm -f $(CGIT_SCRIPT_PATH)/cgit.css
+	rm -rf $(CACHE_ROOT)
+
+clean:
+	rm -f cgit VERSION *.o
+	cd git && $(MAKE) clean
 
-distclean: distclean-cgit distclean-sub
+distclean: clean
+	git clean -d -x
+	cd git && git clean -d -x
 
-.PHONY: all install clean clean-cgit clean-sub clean-cache \
-	distclean distclean-cgit distclean-sub
+get-git:
+	curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git