@matheusbsbs / matheus-bagliano / commits / a23cd8ece7
Fork 0

Handle Cygwin .exe extensions

Peter Anvin committed Sep 28, 2005 at 19:08 UTC a23cd8ece70262fac2a80ef3e454c1cf1c63605a
1 file changed +24 -24
Makefile
+24 -24
@@ -99,11 +99,7 @@ SCRIPT_PYTHON = \
99 # The ones that do not have to link with lcrypto nor lz.
100 SIMPLE_PROGRAMS = \
101 git-get-tar-commit-id git-mailinfo git-mailsplit git-stripspace \
102 - git-var
103 -ifndef NO_IPV6
104 -# Not supported to IPv6-challenged platforms yet
105 -SIMPLE_PROGRAMS += git-daemon
106 -endif
102 + git-var git-daemon
103
104 # ... and all the rest
105 PROGRAMS = \
@@ -182,6 +178,7 @@ ifeq ($(shell uname -o),Cygwin)
178 NO_STRCASESTR = YesPlease
179 NEEDS_LIBICONV = YesPlease
180 NO_IPV6 = YesPlease
181 + X = .exe
182 endif
183 ifneq (,$(findstring arm,$(shell uname -m)))
184 ARM_SHA1 = YesPlease
@@ -267,10 +264,13 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
264 $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
265 gitk
266
267 +PROGRAMS_X = $(patsubst %,%$(X),$(PROGRAMS))
268 +SIMPLE_PROGRAMS_X = $(patsubst %,%$(X),$(SIMPLE_PROGRAMS))
269 +
270 export TAR INSTALL DESTDIR SHELL_PATH
271 ### Build rules
272
273 -all: $(PROGRAMS) $(SCRIPTS)
273 +all: $(PROGRAMS_X) $(SCRIPTS)
274
275 all:
276 $(MAKE) -C templates
@@ -304,30 +304,30 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
304 %.o: %.S
305 $(CC) -o $*.o -c $(ALL_CFLAGS) $<
306
307 -git-%: %.o $(LIB_FILE)
307 +git-%$(X): %.o $(LIB_FILE)
308 $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
309
310 -git-mailinfo : SIMPLE_LIB += $(LIB_4_ICONV)
311 -$(SIMPLE_PROGRAMS) : $(LIB_FILE)
312 -$(SIMPLE_PROGRAMS) : git-% : %.o
310 +git-mailinfo$(X) : SIMPLE_LIB += $(LIB_4_ICONV)
311 +$(SIMPLE_PROGRAMS_X) : $(LIB_FILE)
312 +$(SIMPLE_PROGRAMS_X) : git-%$(X) : %.o
313 $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIB_FILE) $(SIMPLE_LIB)
314
315 -git-http-fetch: fetch.o
316 -git-local-fetch: fetch.o
317 -git-ssh-fetch: rsh.o fetch.o
318 -git-ssh-upload: rsh.o
319 -git-ssh-pull: rsh.o fetch.o
320 -git-ssh-push: rsh.o
315 +git-http-fetch$(X): fetch.o
316 +git-local-fetch$(X): fetch.o
317 +git-ssh-fetch$(X): rsh.o fetch.o
318 +git-ssh-upload$(X): rsh.o
319 +git-ssh-pull$(X): rsh.o fetch.o
320 +git-ssh-push$(X): rsh.o
321
322 -git-http-fetch: LIBS += $(CURL_LIBCURL)
323 -git-rev-list: LIBS += $(OPENSSL_LIBSSL)
322 +git-http-fetch$(X): LIBS += $(CURL_LIBCURL)
323 +git-rev-list$(X): LIBS += $(OPENSSL_LIBSSL)
324
325 init-db.o: init-db.c
326 $(CC) -c $(ALL_CFLAGS) \
327 -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
328
329 $(LIB_OBJS): $(LIB_H)
330 -$(patsubst git-%,%.o,$(PROGRAMS)): $(LIB_H)
330 +$(patsubst git-%$(X),%.o,$(PROGRAMS_X)): $(LIB_H)
331 $(DIFF_OBJS): diffcore.h
332
333 $(LIB_FILE): $(LIB_OBJS)
@@ -342,10 +342,10 @@ doc:
342 test: all
343 $(MAKE) -C t/ all
344
345 -test-date: test-date.c date.o
345 +test-date$(X): test-date.c date.o
346 $(CC) $(ALL_CFLAGS) -o $@ test-date.c date.o
347
348 -test-delta: test-delta.c diff-delta.o patch-delta.o
348 +test-delta$(X): test-delta.c diff-delta.o patch-delta.o
349 $(CC) $(ALL_CFLAGS) -o $@ $^
350
351 check:
@@ -355,9 +355,9 @@ check:
355
356 ### Installation rules
357
358 -install: $(PROGRAMS) $(SCRIPTS)
358 +install: $(PROGRAMS_X) $(SCRIPTS)
359 $(INSTALL) -d -m755 $(DESTDIR)$(bindir)
360 - $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
360 + $(INSTALL) $(PROGRAMS_X) $(SCRIPTS) $(DESTDIR)$(bindir)
361 $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
362 $(MAKE) -C templates install
363 $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
@@ -395,7 +395,7 @@ deb: dist
395 ### Cleaning rules
396
397 clean:
398 - rm -f *.o *.exe mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE)
398 + rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS_X) $(LIB_FILE)
399 rm -f $(filter-out gitk,$(SCRIPTS))
400 rm -f git-core.spec *.pyc *.pyo
401 rm -rf $(GIT_TARNAME)