Make cgit honor CACHE_ROOT as defined in Makefile

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 644914c983c34fa96e823042ddf6088cd23422c4..7857b8ea11586a792eda921e404d3f109b0d40f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,72 @@
-CGIT_VERSION = 0.2
+CGIT_VERSION = v0.6
+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.3
+GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2

 
 

-prefix = /var/www/htdocs/cgit
-gitsrc = git
+#
+# Let the user override the above settings.
+#
+-include cgit.conf

 
 

-SHA1_HEADER = <openssl/sha.h>

 
 

-CACHE_ROOT = /var/cache/cgit
-EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/xdiff/lib.a -lz -lcrypto
+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.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 += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)'
+VERSION: force-version
+       @./gen-version.sh "$(CGIT_VERSION)"
+-include VERSION

 
 

-all: cgit

 
 

-install: all clean-cache
-       mkdir -p $(prefix)
-       install cgit $(prefix)/cgit.cgi
-       install cgit.css $(prefix)/cgit.css
+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)"'
+CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'

 
 

-cgit: cgit.c cgit.h $(OBJECTS) $(gitsrc)/libgit.a
-       $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
-               $(OBJECTS) $(EXTLIBS)

 
 

-$(OBJECTS): cgit.h
+cgit: cgit.c $(OBJECTS)
+       $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)

 
 

-$(gitsrc)/libgit.a:
-       $(MAKE) -C $(gitsrc)
+$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION

 
 

+git/xdiff/lib.a: | git
+
+git/libgit.a: | git
+
+git:
+       cd git && $(MAKE) xdiff/lib.a
+       cd git && $(MAKE) libgit.a
+
+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
+       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+
+uninstall:
+       rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
+       rm -rf $(DESTDIR)$(CACHE_ROOT)

 
 

-.PHONY: clean

 clean:
 clean:

-       rm -f cgit *.o
+       rm -f cgit VERSION *.o
+       cd git && $(MAKE) clean
+
+distclean: clean
+       git clean -d -x
+       cd git && git clean -d -x

 
 

-clean-cache:
-       rm -rf $(CACHE_ROOT)/*
+get-git:
+       curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git