X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/d14c5f6d3ac827e7b46831c4151638ab4b638ae1..14d360df60f059b9b5b045fc6df1eec6f0966d9a:/Makefile

diff --git a/Makefile b/Makefile
index 64bbd5c..d826f97 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,41 @@
-CGIT_VERSION = 0.1-pre
+CGIT_VERSION = 0.2
 
-INSTALL_BIN = /var/www/htdocs/cgit.cgi
-INSTALL_CSS = /var/www/htdocs/cgit.css
-CACHE_ROOT = /var/cache/cgit
+prefix = /var/www/htdocs/cgit
+gitsrc = ../git
 
-EXTLIBS = ../git/libgit.a ../git/xdiff/lib.a -lz -lcrypto
-OBJECTS = cache.o parsing.o html.o ui-shared.o ui-repolist.o ui-summary.o \
-	ui-log.o
+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
 
 CFLAGS += -Wall
 
+ifdef DEBUG
+	CFLAGS += -g
+endif
+
 all: cgit
 
-install: all
-	install cgit $(INSTALL_BIN)
-	install cgit.css $(INSTALL_CSS)
-	rm -rf $(CACHE_ROOT)/*
+install: all clean-cache
+	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 git.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
+
+$(gitsrc)/libgit.a:
+	$(MAKE) -C $(gitsrc)
+
+
 .PHONY: clean
 clean:
 	rm -f cgit *.o
+
+clean-cache:
+	rm -rf $(CACHE_ROOT)/*