Added git as a submodule

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index a3e9b053e6d38bf1cde875cb11e2184a7e6cf21f..644914c983c34fa96e823042ddf6088cd23422c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
-CGIT_VERSION = 0.1
+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
+
+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
 
@@ -14,19 +17,24 @@ ifdef DEBUG
        CFLAGS += -g
 endif
 
+CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)'
+
 all: cgit
 
 install: all clean-cache
-       install cgit $(INSTALL_BIN)
-       install cgit.css $(INSTALL_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: