author | Lars Hjemli <hjemli@gmail.com> | 2008-03-25 00:41:10 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-25 00:41:10 (UTC) |
commit | c60781d677ee3b2e53b1f3078fef763622e5effe (patch) (unidiff) | |
tree | 354f69735d307ef7a82b690789f89663593e2c77 | |
parent | 92908af4558d7362c7deeb05254343a5a5f11a05 (diff) | |
download | cgit-c60781d677ee3b2e53b1f3078fef763622e5effe.zip cgit-c60781d677ee3b2e53b1f3078fef763622e5effe.tar.gz cgit-c60781d677ee3b2e53b1f3078fef763622e5effe.tar.bz2 |
Makefile: copy the QUIET constructs from the Makefile in git.git
These constructs were introduced by Shawn O. Pearce in commit
74f2b2a8d006a49e1be7e30731c2f7365d2741d1.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 36 |
1 files changed, 31 insertions, 5 deletions
@@ -13,4 +13,24 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | |||
13 | -include cgit.conf | 13 | -include cgit.conf |
14 | 14 | ||
15 | # | ||
16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | ||
17 | # from git.git | ||
18 | # | ||
19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | ||
20 | QUIET_SUBDIR1 = | ||
21 | |||
22 | ifneq ($(findstring $(MAKEFLAGS),w),w) | ||
23 | PRINT_DIR = --no-print-directory | ||
24 | else # "make -w" | ||
25 | NO_SUBDIR = : | ||
26 | endif | ||
27 | |||
28 | ifndef V | ||
29 | QUIET_CC = @echo ' ' CC $@; | ||
30 | QUIET_MM = @echo ' ' MM $@; | ||
31 | QUIET_SUBDIR0 = +@subdir= | ||
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | ||
33 | $(MAKE) $(PRINT_DIR) -C $$subdir | ||
34 | endif | ||
15 | 35 | ||
16 | # | 36 | # |
@@ -18,5 +38,11 @@ GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | |||
18 | # | 38 | # |
19 | %.d: %.c | 39 | %.d: %.c |
20 | $(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ | 40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
41 | |||
42 | # | ||
43 | # Define a pattern rule for silent object building | ||
44 | # | ||
45 | %.o: %.c | ||
46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | ||
21 | 47 | ||
22 | 48 | ||
@@ -65,5 +91,5 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | |||
65 | 91 | ||
66 | cgit: $(OBJECTS) | 92 | cgit: $(OBJECTS) |
67 | $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 93 | $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
68 | 94 | ||
69 | $(OBJECTS): git/xdiff/lib.a git/libgit.a | 95 | $(OBJECTS): git/xdiff/lib.a git/libgit.a |
@@ -78,9 +104,9 @@ git/libgit.a: | git | |||
78 | 104 | ||
79 | git: | 105 | git: |
80 | cd git && $(MAKE) xdiff/lib.a | 106 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
81 | cd git && $(MAKE) libgit.a | 107 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
82 | 108 | ||
83 | test: all | 109 | test: all |
84 | $(MAKE) -C tests | 110 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
85 | 111 | ||
86 | install: all | 112 | install: all |