Use GIT-1.5.4

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 4d2ede3d49391e61fd6b7105ffbc833239ecc689..bcea640adeac8d939ff05a6f9c80334109f4f114 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,83 @@
-CGIT_VERSION = 0.1-pre
-
-INSTALL_BIN = /var/www/htdocs/cgit.cgi
-INSTALL_CSS = /var/www/htdocs/cgit.css
+CGIT_VERSION = v0.7.2
+CGIT_SCRIPT_NAME = cgit.cgi
+CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
+CGIT_CONFIG = /etc/cgitrc

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

+SHA1_HEADER = <openssl/sha.h>
+GIT_VER = 1.5.4
+GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+
+#
+# Let the user override the above settings.
+#
+-include cgit.conf
+

 
 

-EXTLIBS = ../git/libgit.a ../git/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.c ui-tree.c
+       ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
+       ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o

 
 

-CFLAGS += -Wall

 
 

-all: cgit
+ifdef NEEDS_LIBICONV
+       EXTLIBS += -liconv
+endif
+
+
+.PHONY: all git test install clean distclean emptycache force-version get-git
+
+all: cgit git
+
+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)"'
+CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'

 
 

-install: all
-       install cgit $(INSTALL_BIN)
-       install cgit.css $(INSTALL_CSS)
-       rm -rf $(CACHE_ROOT)/*

 
 

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

 
 

-$(OBJECTS): cgit.h git.h
+$(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
+
+test: all
+       $(MAKE) -C tests
+
+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
+       install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
+
+uninstall:
+       rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
+       rm -f $(CGIT_SCRIPT_PATH)/cgit.css
+       rm -f $(CGIT_SCRIPT_PATH)/cgit.png

 
 

-.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
+
+emptycache:
+       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
+
+get-git:
+       curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git