Added git as a submodule

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index e8632055c82acb825a16dfbf3379a632bbdc371d..644914c983c34fa96e823042ddf6088cd23422c4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
-CGIT_VERSION = 0.1
+CGIT_VERSION = 0.2

 
 prefix = /var/www/htdocs/cgit
 
 prefix = /var/www/htdocs/cgit

-gitsrc = ../git
+gitsrc = git
+
+SHA1_HEADER = <openssl/sha.h>

 
 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 \
 
 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
 
 
 CFLAGS += -Wall
 


@@ -14,6 +17,8 @@ ifdef DEBUG
        CFLAGS += -g
 endif
 
        CFLAGS += -g
 endif
 

+CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)'
+

 all: cgit
 
 install: all clean-cache
 all: cgit
 
 install: all clean-cache


@@ -21,13 +26,11 @@ install: all clean-cache
        install cgit $(prefix)/cgit.cgi
        install cgit.css $(prefix)/cgit.css
 
        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)
 
        $(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)
 
 $(gitsrc)/libgit.a:
        $(MAKE) -C $(gitsrc)