X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/ca8eb8fc8f71ee0a40015c323619f776840b6503..486c87ec2906c445ca505c877720d56e02aed784:/Makefile

diff --git a/Makefile b/Makefile
index 7c0527b..c2a5736 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,20 @@
-CGIT_VERSION = 0.2
+CGIT_VERSION = 0.5
 
 prefix = /var/www/htdocs/cgit
-gitsrc = ../git
 
 SHA1_HEADER = <openssl/sha.h>
-
 CACHE_ROOT = /var/cache/cgit
-EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/xdiff/lib.a -lz -lcrypto
+CGIT_CONFIG = /etc/cgitrc
+CGIT_SCRIPT_NAME = cgit.cgi
+
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
+
+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-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
 	ui-snapshot.o ui-blob.o
 
 CFLAGS += -Wall
@@ -17,28 +23,65 @@ ifdef DEBUG
 	CFLAGS += -g
 endif
 
-CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)'
+CFLAGS += -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, get the git sources as a tarball.
+#
+GITVER = $(shell git version 2>/dev/null || echo nogit)
+ifeq ($(GITVER),nogit)
+GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
+INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
+else
+INITGIT = ./submodules.sh -i
+endif
+
 
+#
+# basic build rules
+#
 all: cgit
 
+cgit: cgit.c cgit.h $(OBJECTS)
+	$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
+
+$(OBJECTS): cgit.h git/libgit.a
+
+git/libgit.a:
+	$(INITGIT)
+	$(MAKE) -C git
+
+#
+# phony targets
+#
 install: all clean-cache
 	mkdir -p $(prefix)
-	install cgit $(prefix)/cgit.cgi
+	install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
 	install cgit.css $(prefix)/cgit.css
 
-cgit: cgit.c cgit.h $(OBJECTS) $(gitsrc)/libgit.a
-	$(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
-		$(OBJECTS) $(EXTLIBS)
-
-$(OBJECTS): cgit.h
+clean-cgit:
+	rm -f cgit *.o
 
-$(gitsrc)/libgit.a:
-	$(MAKE) -C $(gitsrc)
+distclean-cgit: clean-cgit
+	git clean -d -x
 
+clean-sub:
+	$(MAKE) -C git clean
 
-.PHONY: clean
-clean:
-	rm -f cgit *.o
+distclean-sub: clean-sub
+	$(shell cd git && git clean -d -x)
 
 clean-cache:
 	rm -rf $(CACHE_ROOT)/*
+
+clean: clean-cgit clean-sub
+
+distclean: distclean-cgit distclean-sub
+
+.PHONY: all install clean clean-cgit clean-sub clean-cache \
+	distclean distclean-cgit distclean-sub