Do not alter incoming sha1 when handling the download refs.

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 7c0527b0ff81623c051b68ae59a6f42aaa52fa81..96d68cbd0c781af77a074c23ca40aef759128532 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
-CGIT_VERSION = 0.2
+CGIT_VERSION = 0.4
 
 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
+
+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
@@ -17,28 +18,68 @@ 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, 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)
+       $(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
+       install add.png del.png $(prefix)/
 
-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