X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/4a9dea5c0104471324f01663420685e45fe3b480..e743443811f5816f02a9ca67404613be97bfa615:/Makefile

diff --git a/Makefile b/Makefile
index 72a1cff..644914c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,15 @@
-CGIT_VERSION = 0.1
+CGIT_VERSION = 0.2
 
-INSTALL_DIR = /var/www/htdocs/cgit
-CACHE_ROOT = /var/cache/cgit
+prefix = /var/www/htdocs/cgit
+gitsrc = git
+
+SHA1_HEADER = <openssl/sha.h>
 
-EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
+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 ui-blob.o
 
 CFLAGS += -Wall
 
@@ -13,19 +17,24 @@ ifdef DEBUG
 	CFLAGS += -g
 endif
 
+CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)'
+
 all: cgit
 
 install: all clean-cache
-	install cgit $(INSTALL_DIR)/cgit.cgi
-	install cgit.css $(INSTALL_DIR)/cgit.css
+	mkdir -p $(prefix)
+	install cgit $(prefix)/cgit.cgi
+	install cgit.css $(prefix)/cgit.css
 
-cgit: cgit.c cgit.h git.h $(OBJECTS)
+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
+$(OBJECTS): cgit.h
+
+$(gitsrc)/libgit.a:
+	$(MAKE) -C $(gitsrc)
 
-ui-diff.o: xdiff.h
 
 .PHONY: clean
 clean: