added a chk_non_negative check

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index a3e9b053e6d38bf1cde875cb11e2184a7e6cf21f..cea09f15025f1e9b53d08eaa778af92590a80fae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,29 @@
-CGIT_VERSION = 0.1
-
-INSTALL_BIN = /var/www/htdocs/cgit.cgi
-INSTALL_CSS = /var/www/htdocs/cgit.css
+prefix = /var/www/htdocs/cgit
+SHA1_HEADER = <openssl/sha.h>

 CACHE_ROOT = /var/cache/cgit
 CACHE_ROOT = /var/cache/cgit

+CGIT_CONFIG = /etc/cgitrc
+CGIT_SCRIPT_NAME = cgit.cgi
+
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
+
+
+CGIT_VERSION = 0.5
+
+all: cgit

 
 

-EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
+VERSION:
+       sh gen-version.sh
+
+-include VERSION
+
+
+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 \
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \

-       ui-summary.o ui-log.o ui-view.c ui-tree.c ui-commit.c 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
 
 
 CFLAGS += -Wall
 


@@ -14,23 +31,64 @@ ifdef DEBUG
        CFLAGS += -g
 endif
 
        CFLAGS += -g
 endif
 

-all: cgit
+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
+
+
+cgit: cgit.c cgit.h VERSION $(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
 install: all clean-cache

-       install cgit $(INSTALL_BIN)
-       install cgit.css $(INSTALL_CSS)
+       mkdir -p $(prefix)
+       install cgit $(prefix)/$(CGIT_SCRIPT_NAME)
+       install cgit.css $(prefix)/cgit.css

 
 

-cgit: cgit.c cgit.h git.h $(OBJECTS)
-       $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
-               $(OBJECTS) $(EXTLIBS)
+clean-cgit:
+       rm -f cgit VERSION *.o

 
 

-$(OBJECTS): cgit.h git.h
+distclean-cgit: clean-cgit
+       git clean -d -x

 
 

-ui-diff.o: xdiff.h
+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-cache:
        rm -rf $(CACHE_ROOT)/*

+
+clean: clean-cgit clean-sub
+
+distclean: distclean-cgit distclean-sub
+
+version: clean-cgit
+       ./gen-version.sh
+       make
+
+.PHONY: all install clean clean-cgit clean-sub clean-cache \
+       distclean distclean-cgit distclean-sub release version