|
diff --git a/Makefile b/Makefile index dda743d..15c7c20 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -38,65 +38,65 @@ ifeq ($(uname_O),Cygwin) |
38 | endif |
38 | endif |
39 | |
39 | |
40 | # |
40 | # |
41 | # Let the user override the above settings. |
41 | # Let the user override the above settings. |
42 | # |
42 | # |
43 | -include cgit.conf |
43 | -include cgit.conf |
44 | |
44 | |
45 | # |
45 | # |
46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
47 | # from git.git |
47 | # from git.git |
48 | # |
48 | # |
49 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
49 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
50 | QUIET_SUBDIR1 = |
50 | QUIET_SUBDIR1 = |
51 | |
51 | |
52 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
52 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
53 | PRINT_DIR = --no-print-directory |
53 | PRINT_DIR = --no-print-directory |
54 | else # "make -w" |
54 | else # "make -w" |
55 | NO_SUBDIR = : |
55 | NO_SUBDIR = : |
56 | endif |
56 | endif |
57 | |
57 | |
58 | ifndef V |
58 | ifndef V |
59 | QUIET_CC = @echo ' ' CC $@; |
59 | QUIET_CC = @echo ' ' CC $@; |
60 | QUIET_MM = @echo ' ' MM $@; |
60 | QUIET_MM = @echo ' ' MM $@; |
61 | QUIET_SUBDIR0 = +@subdir= |
61 | QUIET_SUBDIR0 = +@subdir= |
62 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
62 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
63 | $(MAKE) $(PRINT_DIR) -C $$subdir |
63 | $(MAKE) $(PRINT_DIR) -C $$subdir |
64 | endif |
64 | endif |
65 | |
65 | |
66 | # |
66 | # |
67 | # Define a pattern rule for automatic dependency building |
67 | # Define a pattern rule for automatic dependency building |
68 | # |
68 | # |
69 | %.d: %.c |
69 | %.d: %.c |
70 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
70 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
71 | |
71 | |
72 | # |
72 | # |
73 | # Define a pattern rule for silent object building |
73 | # Define a pattern rule for silent object building |
74 | # |
74 | # |
75 | %.o: %.c |
75 | %.o: %.c |
76 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
76 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
77 | |
77 | |
78 | |
78 | |
79 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
79 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
80 | OBJECTS = |
80 | OBJECTS = |
81 | OBJECTS += cache.o |
81 | OBJECTS += cache.o |
82 | OBJECTS += cgit.o |
82 | OBJECTS += cgit.o |
83 | OBJECTS += cmd.o |
83 | OBJECTS += cmd.o |
84 | OBJECTS += configfile.o |
84 | OBJECTS += configfile.o |
85 | OBJECTS += html.o |
85 | OBJECTS += html.o |
86 | OBJECTS += parsing.o |
86 | OBJECTS += parsing.o |
87 | OBJECTS += scan-tree.o |
87 | OBJECTS += scan-tree.o |
88 | OBJECTS += shared.o |
88 | OBJECTS += shared.o |
89 | OBJECTS += ui-atom.o |
89 | OBJECTS += ui-atom.o |
90 | OBJECTS += ui-blob.o |
90 | OBJECTS += ui-blob.o |
91 | OBJECTS += ui-clone.o |
91 | OBJECTS += ui-clone.o |
92 | OBJECTS += ui-commit.o |
92 | OBJECTS += ui-commit.o |
93 | OBJECTS += ui-diff.o |
93 | OBJECTS += ui-diff.o |
94 | OBJECTS += ui-log.o |
94 | OBJECTS += ui-log.o |
95 | OBJECTS += ui-patch.o |
95 | OBJECTS += ui-patch.o |
96 | OBJECTS += ui-plain.o |
96 | OBJECTS += ui-plain.o |
97 | OBJECTS += ui-refs.o |
97 | OBJECTS += ui-refs.o |
98 | OBJECTS += ui-repolist.o |
98 | OBJECTS += ui-repolist.o |
99 | OBJECTS += ui-shared.o |
99 | OBJECTS += ui-shared.o |
100 | OBJECTS += ui-snapshot.o |
100 | OBJECTS += ui-snapshot.o |
101 | OBJECTS += ui-ssdiff.o |
101 | OBJECTS += ui-ssdiff.o |
102 | OBJECTS += ui-stats.o |
102 | OBJECTS += ui-stats.o |
|