Makefile: Git dependency, take 3

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index faf7b98ae8b658af4af1a6b3326f7af6a95ef45f..ab0bbd4d4fcea6c92069e1132c4f7a735c3cd7e7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.5.4.1
+GIT_VER = 1.5.6
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -12,12 +12,38 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 #
 -include cgit.conf
 
+#
+# Define a way to invoke make in subdirs quietly, shamelessly ripped
+# from git.git
+#
+QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1  =
+
+ifneq ($(findstring $(MAKEFLAGS),w),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :
+endif
+
+ifndef V
+       QUIET_CC       = @echo '   ' CC $@;
+       QUIET_MM       = @echo '   ' MM $@;
+       QUIET_SUBDIR0  = +@subdir=
+       QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
+                        $(MAKE) $(PRINT_DIR) -C $$subdir
+endif
 
 #
 # Define a pattern rule for automatic dependency building
 #
 %.d: %.c
-       $(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
+       $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@
+
+#
+# Define a pattern rule for silent object building
+#
+%.o: %.c
+       $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 
 
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
@@ -25,9 +51,11 @@ OBJECTS =
 OBJECTS += cache.o
 OBJECTS += cgit.o
 OBJECTS += cmd.o
+OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += shared.o
+OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
 OBJECTS += ui-commit.o
 OBJECTS += ui-diff.o
@@ -46,9 +74,9 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all git test install clean distclean emptycache force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git
 
-all: cgit git
+all: cgit
 
 VERSION: force-version
        @./gen-version.sh "$(CGIT_VERSION)"
@@ -63,23 +91,19 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-cgit: $(OBJECTS)
-       $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
+cgit: $(OBJECTS) libgit
+       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): git/xdiff/lib.a git/libgit.a VERSION
+cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
-git/xdiff/lib.a: | git
-
-git/libgit.a: | git
-
-git:
-       cd git && $(MAKE) xdiff/lib.a
-       cd git && $(MAKE) libgit.a
+libgit:
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
 
 test: all
-       $(MAKE) -C tests
+       $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
 
 install: all
        mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
@@ -94,14 +118,6 @@ uninstall:
 
 clean:
        rm -f cgit VERSION *.o *.d
-       cd git && $(MAKE) clean
-
-distclean: clean
-       git clean -d -x
-       cd git && git clean -d -x
-
-emptycache:
-       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
 
 get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git