From 61c3ca978c586c673aec618cb94210657278dda8 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Tue, 8 May 2007 22:40:59 +0200 Subject: Update to libgit 1.5.2-rc2 Signed-off-by: Lars Hjemli --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b1c3a4e..24c3963 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,12 @@ CGIT_VERSION = 0.2 prefix = /var/www/htdocs/cgit gitsrc = ../git +SHA1_HEADER = + CACHE_ROOT = /var/cache/cgit EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/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.c ui-tree.c ui-commit.c ui-diff.o \ + ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ ui-snapshot.o CFLAGS += -Wall @@ -15,6 +17,8 @@ ifdef DEBUG CFLAGS += -g endif +CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)' + all: cgit install: all clean-cache @@ -22,13 +26,11 @@ install: all clean-cache install cgit $(prefix)/cgit.cgi install cgit.css $(prefix)/cgit.css -cgit: cgit.c cgit.h git.h $(OBJECTS) $(gitsrc)/libgit.a +cgit: cgit.c cgit.h $(OBJECTS) $(gitsrc)/libgit.a $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ $(OBJECTS) $(EXTLIBS) -$(OBJECTS): cgit.h git.h - -ui-diff.o: xdiff.h +$(OBJECTS): cgit.h $(gitsrc)/libgit.a: $(MAKE) -C $(gitsrc) -- cgit v1.2.1