author | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 11:18:25 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-11 11:18:25 (UTC) |
commit | d1c48e513975c9099406c0cd53f38cfd6f56d347 (patch) (unidiff) | |
tree | bdcf7593ea1586020a9b9a325cdc2d6487cdc0fd /Makefile | |
parent | ef2dc552b298e5c65db8fbe5ff1c375e50d0f057 (diff) | |
parent | c63aaff2adb83e5015841921fab233c2fe2e3b0a (diff) | |
download | cgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.zip cgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.tar.gz cgit-d1c48e513975c9099406c0cd53f38cfd6f56d347.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -107,46 +107,46 @@ VERSION: force-version | |||
107 | 107 | ||
108 | 108 | ||
109 | CFLAGS += -g -Wall -Igit | 109 | CFLAGS += -g -Wall -Igit |
110 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 110 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
111 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 111 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
112 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 112 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
113 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 113 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
114 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 114 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
115 | 115 | ||
116 | ifdef NO_ICONV | 116 | ifdef NO_ICONV |
117 | CFLAGS += -DNO_ICONV | 117 | CFLAGS += -DNO_ICONV |
118 | endif | 118 | endif |
119 | ifdef NO_STRCASESTR | 119 | ifdef NO_STRCASESTR |
120 | CFLAGS += -DNO_STRCASESTR | 120 | CFLAGS += -DNO_STRCASESTR |
121 | endif | 121 | endif |
122 | 122 | ||
123 | cgit: $(OBJECTS) libgit | 123 | cgit: $(OBJECTS) libgit |
124 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 124 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
125 | 125 | ||
126 | cgit.o: VERSION | 126 | cgit.o: VERSION |
127 | 127 | ||
128 | -include $(OBJECTS:.o=.d) | 128 | -include $(OBJECTS:.o=.d) |
129 | 129 | ||
130 | libgit: | 130 | libgit: |
131 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a | 131 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
132 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a | 132 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
133 | 133 | ||
134 | test: all | 134 | test: all |
135 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all | 135 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
136 | 136 | ||
137 | install: all | 137 | install: all |
138 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) | 138 | mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) |
139 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 139 | install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
140 | install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css | 140 | install -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
141 | install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png | 141 | install -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
142 | 142 | ||
143 | uninstall: | 143 | uninstall: |
144 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 144 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
145 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css | 145 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
146 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png | 146 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
147 | 147 | ||
148 | clean: | 148 | clean: |
149 | rm -f cgit VERSION *.o *.d | 149 | rm -f cgit VERSION *.o *.d |
150 | 150 | ||
151 | get-git: | 151 | get-git: |
152 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git | 152 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |