author | Lars Hjemli <hjemli@gmail.com> | 2010-11-07 15:13:49 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-11-07 15:13:49 (UTC) |
commit | 5807fb79faa49e9a8f2da616e9cc821e0198fcb7 (patch) (unidiff) | |
tree | ab36f62bc5fea3856603f6653f5c8da31233abea | |
parent | d41b2ddcb331caa74c1a90a0253f234142848552 (diff) | |
download | cgit-5807fb79faa49e9a8f2da616e9cc821e0198fcb7.zip cgit-5807fb79faa49e9a8f2da616e9cc821e0198fcb7.tar.gz cgit-5807fb79faa49e9a8f2da616e9cc821e0198fcb7.tar.bz2 |
Makefile: add -MP option
Work around errors `make` gives when header files are removed without
the Makefile being updated.
Signed-off-by: Lynn Lin <Lynn.Lin@emc.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6,129 +6,129 @@ CGIT_CONFIG = /etc/cgitrc | |||
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.7.3 | 8 | GIT_VER = 1.7.3 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 10 | INSTALL = install |
11 | 11 | ||
12 | # Define NO_STRCASESTR if you don't have strcasestr. | 12 | # Define NO_STRCASESTR if you don't have strcasestr. |
13 | # | 13 | # |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 | 14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
15 | # implementation (slower). | 15 | # implementation (slower). |
16 | # | 16 | # |
17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | 17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
18 | # | 18 | # |
19 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) | 19 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) |
20 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, | 20 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, |
21 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). | 21 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). |
22 | # some C compilers supported these specifiers prior to C99 as an extension. | 22 | # some C compilers supported these specifiers prior to C99 as an extension. |
23 | # | 23 | # |
24 | 24 | ||
25 | #-include config.mak | 25 | #-include config.mak |
26 | 26 | ||
27 | # | 27 | # |
28 | # Platform specific tweaks | 28 | # Platform specific tweaks |
29 | # | 29 | # |
30 | 30 | ||
31 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') | 31 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
32 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') | 32 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
33 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | 33 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
34 | 34 | ||
35 | ifeq ($(uname_O),Cygwin) | 35 | ifeq ($(uname_O),Cygwin) |
36 | NO_STRCASESTR = YesPlease | 36 | NO_STRCASESTR = YesPlease |
37 | NEEDS_LIBICONV = YesPlease | 37 | NEEDS_LIBICONV = YesPlease |
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 |
103 | OBJECTS += ui-summary.o | 103 | OBJECTS += ui-summary.o |
104 | OBJECTS += ui-tag.o | 104 | OBJECTS += ui-tag.o |
105 | OBJECTS += ui-tree.o | 105 | OBJECTS += ui-tree.o |
106 | 106 | ||
107 | ifdef NEEDS_LIBICONV | 107 | ifdef NEEDS_LIBICONV |
108 | EXTLIBS += -liconv | 108 | EXTLIBS += -liconv |
109 | endif | 109 | endif |
110 | 110 | ||
111 | 111 | ||
112 | .PHONY: all libgit test install uninstall clean force-version get-git \ | 112 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
113 | doc man-doc html-doc clean-doc | 113 | doc man-doc html-doc clean-doc |
114 | 114 | ||
115 | all: cgit | 115 | all: cgit |
116 | 116 | ||
117 | VERSION: force-version | 117 | VERSION: force-version |
118 | @./gen-version.sh "$(CGIT_VERSION)" | 118 | @./gen-version.sh "$(CGIT_VERSION)" |
119 | -include VERSION | 119 | -include VERSION |
120 | 120 | ||
121 | 121 | ||
122 | CFLAGS += -g -Wall -Igit | 122 | CFLAGS += -g -Wall -Igit |
123 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 123 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
124 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 124 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
125 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 125 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
126 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 126 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
127 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 127 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
128 | 128 | ||
129 | ifdef NO_ICONV | 129 | ifdef NO_ICONV |
130 | CFLAGS += -DNO_ICONV | 130 | CFLAGS += -DNO_ICONV |
131 | endif | 131 | endif |
132 | ifdef NO_STRCASESTR | 132 | ifdef NO_STRCASESTR |
133 | CFLAGS += -DNO_STRCASESTR | 133 | CFLAGS += -DNO_STRCASESTR |
134 | endif | 134 | endif |