1 files changed, 36 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 644914c..138f261 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
 CGIT_VERSION = 0.2
 
 prefix = /var/www/htdocs/cgit
-gitsrc = git
 
 SHA1_HEADER = <openssl/sha.h>
 
 CACHE_ROOT = /var/cache/cgit
-EXTLIBS = $(gitsrc)/libgit.a $(gitsrc)/xdiff/lib.a -lz -lcrypto
+EXTLIBS = git/libgit.a git/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.o ui-tree.o ui-commit.o ui-diff.o \
         ui-snapshot.o ui-blob.o
@@ -17,28 +16,52 @@ ifdef DEBUG
         CFLAGS += -g
 endif
 
-CFLAGS += -I$(gitsrc) -DSHA1_HEADER='$(SHA1_HEADER)'
+CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
 
+
+
+
+#
+# basic build rules
+#
 all: cgit
 
+cgit: cgit.c cgit.h $(OBJECTS)
+        $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
+                $(OBJECTS) $(EXTLIBS)
+
+$(OBJECTS): cgit.h git/libgit.a
+
+git/libgit.a:
+        ./submodules.sh -i
+        $(MAKE) -C git
+
+#
+# phony targets
+#
 install: all clean-cache
         mkdir -p $(prefix)
         install cgit $(prefix)/cgit.cgi
         install cgit.css $(prefix)/cgit.css
 
-cgit: cgit.c cgit.h $(OBJECTS) $(gitsrc)/libgit.a
-        $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
-                $(OBJECTS) $(EXTLIBS)
-
-$(OBJECTS): cgit.h
+clean-cgit:
+        rm -f cgit *.o
 
-$(gitsrc)/libgit.a:
-        $(MAKE) -C $(gitsrc)
+distclean-cgit: clean-cgit
+        git clean -d -x
 
+clean-sub:
+        $(MAKE) -C git clean
 
-.PHONY: clean
-clean:
-        rm -f cgit *.o
+distclean-sub: clean-sub
+        $(shell cd git && git clean -d -x)
 
 clean-cache:
         rm -rf $(CACHE_ROOT)/*
+
+clean: clean-cgit clean-sub
+
+distclean: distclean-cgit distclean-sub
+
+.PHONY: all install clean clean-cgit clean-sub clean-cache \
+        distclean distclean-cgit distclean-sub