Makefile fix for better rebuilding of libgit and new git version
authorChristian Thaeter <ct@pipapo.org>
Sun, 6 Jan 2008 01:20:41 +0000 (02:20 +0100)
committerChristian Thaeter <ct@pipapo.org>
Sun, 6 Jan 2008 01:20:41 +0000 (02:20 +0100)
Makefile.am
git

index 992f1c1..93bfec4 100644 (file)
 
 AUTOMAKE_OPTIONS = gnu
 
-git/libgit.a:
-       cd $(top_srcdir)/git; make libgit.a && cp libgit.a $(abs_top_builddir)/git/
+$(top_srcdir)/git/libgit.a: $(top_srcdir)/git/*.c
+       cd $(top_srcdir)/git; make libgit.a
+
+$(abs_top_builddir)/git/libgit.a: $(top_srcdir)/git/libgit.a
+       cp $(top_srcdir)/git/libgit.a $(abs_top_builddir)/git/
 
 webgit_srcdir = $(top_srcdir)/src
 
@@ -48,6 +51,8 @@ noinst_HEADERS =                              \
        $(webgit_srcdir)/object.h               \
        $(webgit_srcdir)/log.h
 
+webgit_DEPENDENCIES = $(abs_top_builddir)/git/libgit.a
+
 webgit_LDADD = -lcwa -lssl git/libgit.a
 
 #### test suite
diff --git a/git b/git
index 3a969ef..0ccbc20 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 3a969ef1d67e3b3a26c36cfbe94f6dba05d6dc69
+Subproject commit 0ccbc20dfc6f567910f73d45743ec4d5777761a0