author | Karl Chen <quarl@cs.berkeley.edu> | 2008-11-05 10:45:18 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-11-06 19:46:44 (UTC) |
commit | 5b27248301db4b246bcd9977c6c3d2d4497b9ecb (patch) (unidiff) | |
tree | b207b2f561a77c26d7b7cbdb83bb392489845c2c | |
parent | e4d2f2b042100182ff5b214fd6848b71d70fad7d (diff) | |
download | cgit-5b27248301db4b246bcd9977c6c3d2d4497b9ecb.zip cgit-5b27248301db4b246bcd9977c6c3d2d4497b9ecb.tar.gz cgit-5b27248301db4b246bcd9977c6c3d2d4497b9ecb.tar.bz2 |
Use mode 0644 for non-executable files
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,129 +1,129 @@ | |||
1 | CGIT_VERSION = v0.8.1 | 1 | CGIT_VERSION = v0.8.1 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.6.0.3 | 7 | GIT_VER = 1.6.0.3 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | 9 | ||
10 | # | 10 | # |
11 | # Let the user override the above settings. | 11 | # Let the user override the above settings. |
12 | # | 12 | # |
13 | -include cgit.conf | 13 | -include cgit.conf |
14 | 14 | ||
15 | # | 15 | # |
16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
17 | # from git.git | 17 | # from git.git |
18 | # | 18 | # |
19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
20 | QUIET_SUBDIR1 = | 20 | QUIET_SUBDIR1 = |
21 | 21 | ||
22 | ifneq ($(findstring $(MAKEFLAGS),w),w) | 22 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
23 | PRINT_DIR = --no-print-directory | 23 | PRINT_DIR = --no-print-directory |
24 | else # "make -w" | 24 | else # "make -w" |
25 | NO_SUBDIR = : | 25 | NO_SUBDIR = : |
26 | endif | 26 | endif |
27 | 27 | ||
28 | ifndef V | 28 | ifndef V |
29 | QUIET_CC = @echo ' ' CC $@; | 29 | QUIET_CC = @echo ' ' CC $@; |
30 | QUIET_MM = @echo ' ' MM $@; | 30 | QUIET_MM = @echo ' ' MM $@; |
31 | QUIET_SUBDIR0 = +@subdir= | 31 | QUIET_SUBDIR0 = +@subdir= |
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ | 32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
33 | $(MAKE) $(PRINT_DIR) -C $$subdir | 33 | $(MAKE) $(PRINT_DIR) -C $$subdir |
34 | endif | 34 | endif |
35 | 35 | ||
36 | # | 36 | # |
37 | # Define a pattern rule for automatic dependency building | 37 | # Define a pattern rule for automatic dependency building |
38 | # | 38 | # |
39 | %.d: %.c | 39 | %.d: %.c |
40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ | 40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
41 | 41 | ||
42 | # | 42 | # |
43 | # Define a pattern rule for silent object building | 43 | # Define a pattern rule for silent object building |
44 | # | 44 | # |
45 | %.o: %.c | 45 | %.o: %.c |
46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< | 46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
47 | 47 | ||
48 | 48 | ||
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = | 50 | OBJECTS = |
51 | OBJECTS += cache.o | 51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o | 52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o | 53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o | 54 | OBJECTS += configfile.o |
55 | OBJECTS += html.o | 55 | OBJECTS += html.o |
56 | OBJECTS += parsing.o | 56 | OBJECTS += parsing.o |
57 | OBJECTS += scan-tree.o | 57 | OBJECTS += scan-tree.o |
58 | OBJECTS += shared.o | 58 | OBJECTS += shared.o |
59 | OBJECTS += ui-atom.o | 59 | OBJECTS += ui-atom.o |
60 | OBJECTS += ui-blob.o | 60 | OBJECTS += ui-blob.o |
61 | OBJECTS += ui-clone.o | 61 | OBJECTS += ui-clone.o |
62 | OBJECTS += ui-commit.o | 62 | OBJECTS += ui-commit.o |
63 | OBJECTS += ui-diff.o | 63 | OBJECTS += ui-diff.o |
64 | OBJECTS += ui-log.o | 64 | OBJECTS += ui-log.o |
65 | OBJECTS += ui-patch.o | 65 | OBJECTS += ui-patch.o |
66 | OBJECTS += ui-plain.o | 66 | OBJECTS += ui-plain.o |
67 | OBJECTS += ui-refs.o | 67 | OBJECTS += ui-refs.o |
68 | OBJECTS += ui-repolist.o | 68 | OBJECTS += ui-repolist.o |
69 | OBJECTS += ui-shared.o | 69 | OBJECTS += ui-shared.o |
70 | OBJECTS += ui-snapshot.o | 70 | OBJECTS += ui-snapshot.o |
71 | OBJECTS += ui-summary.o | 71 | OBJECTS += ui-summary.o |
72 | OBJECTS += ui-tag.o | 72 | OBJECTS += ui-tag.o |
73 | OBJECTS += ui-tree.o | 73 | OBJECTS += ui-tree.o |
74 | 74 | ||
75 | ifdef NEEDS_LIBICONV | 75 | ifdef NEEDS_LIBICONV |
76 | EXTLIBS += -liconv | 76 | EXTLIBS += -liconv |
77 | endif | 77 | endif |
78 | 78 | ||
79 | 79 | ||
80 | .PHONY: all libgit test install uninstall clean force-version get-git | 80 | .PHONY: all libgit test install uninstall clean force-version get-git |
81 | 81 | ||
82 | all: cgit | 82 | all: cgit |
83 | 83 | ||
84 | VERSION: force-version | 84 | VERSION: force-version |
85 | @./gen-version.sh "$(CGIT_VERSION)" | 85 | @./gen-version.sh "$(CGIT_VERSION)" |
86 | -include VERSION | 86 | -include VERSION |
87 | 87 | ||
88 | 88 | ||
89 | CFLAGS += -g -Wall -Igit | 89 | CFLAGS += -g -Wall -Igit |
90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
95 | 95 | ||
96 | ifdef NO_ICONV | 96 | ifdef NO_ICONV |
97 | CFLAGS += -DNO_ICONV | 97 | CFLAGS += -DNO_ICONV |
98 | endif | 98 | endif |
99 | 99 | ||
100 | cgit: $(OBJECTS) libgit | 100 | cgit: $(OBJECTS) libgit |
101 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 101 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
102 | 102 | ||
103 | cgit.o: VERSION | 103 | cgit.o: VERSION |
104 | 104 | ||
105 | -include $(OBJECTS:.o=.d) | 105 | -include $(OBJECTS:.o=.d) |
106 | 106 | ||
107 | libgit: | 107 | libgit: |
108 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a | 108 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a |
109 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a | 109 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a |
110 | 110 | ||
111 | test: all | 111 | test: all |
112 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 112 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
113 | 113 | ||
114 | install: all | 114 | install: all |
115 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 115 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
116 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 116 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
117 | install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 117 | install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
118 | install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 118 | install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
119 | 119 | ||
120 | uninstall: | 120 | uninstall: |
121 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 121 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
122 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 122 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
123 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 123 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
124 | 124 | ||
125 | clean: | 125 | clean: |
126 | rm -f cgit VERSION *.o *.d | 126 | rm -f cgit VERSION *.o *.d |
127 | 127 | ||
128 | get-git: | 128 | get-git: |
129 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 129 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |