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

Introduce $(ALL_PROGRAMS) for 'all:' and 'install:' to operate on.

Remove $(SIMPLE_PROGRAMS) from $(PROGRAMS) so buildrules don't have to be overridden. Put $(SCRIPTS) with the other target-macros so it doesn't get lonely. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>

Andreas Ericsson committed Nov 22, 2005 at 00:44 UTC d6ebd2590cb427a564a7bc21f893b238ce26e26f
1 file changed +15 -13
Makefile
+15 -13
@@ -102,6 +102,11 @@ SCRIPT_PERL = \
102 SCRIPT_PYTHON = \
103 git-merge-recursive.py
104
105 +SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
106 + $(patsubst %.perl,%,$(SCRIPT_PERL)) \
107 + $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
108 + gitk git-cherry-pick
109 +
110 # The ones that do not have to link with lcrypto nor lz.
111 SIMPLE_PROGRAMS = \
112 git-get-tar-commit-id$X git-mailinfo$X git-mailsplit$X \
@@ -125,8 +130,10 @@ PROGRAMS = \
130 git-unpack-objects$X git-update-index$X git-update-server-info$X \
131 git-upload-pack$X git-verify-pack$X git-write-tree$X \
132 git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
128 - git-name-rev$X git-pack-redundant$X git-config-set$X git-var$X \
129 - $(SIMPLE_PROGRAMS)
133 + git-name-rev$X git-pack-redundant$X git-config-set$X git-var$X
134 +
135 +# what 'all' will build and 'install' will install.
136 +ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) git$X
137
138 # Backward compatibility -- to be removed after 1.0
139 PROGRAMS += git-ssh-pull$X git-ssh-push$X
@@ -339,25 +346,20 @@ endif
346
347 ALL_CFLAGS += -DSHA1_HEADER=$(call shellquote,$(SHA1_HEADER))
348
342 -SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
343 - $(patsubst %.perl,%,$(SCRIPT_PERL)) \
344 - $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
345 - gitk git-cherry-pick
346 -
349 export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
350 ### Build rules
351
350 -all: $(PROGRAMS) $(SCRIPTS) git
352 +all: $(ALL_PROGRAMS)
353
354 all:
355 $(MAKE) -C templates
356
357 # Only use $(CFLAGS). We don't need anything else.
356 -git: git.c Makefile
358 +git$(X): git.c Makefile
359 $(CC) -DGIT_EXEC_PATH='"$(bindir)"' -DGIT_VERSION='"$(GIT_VERSION)"' \
358 - $(CFLAGS) $@.c -o $@
360 + $(CFLAGS) $< -o $@
361
360 -$(filter-out git,$(patsubst %.sh,%,$(SCRIPT_SH))) : % : %.sh
362 +$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
363 rm -f $@
364 sed -e '1s|#!.*/sh|#!$(call shq,$(SHELL_PATH))|' \
365 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
@@ -441,9 +443,9 @@ check:
443
444 ### Installation rules
445
444 -install: $(PROGRAMS) $(SCRIPTS) git
446 +install: all
447 $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(bindir))
446 - $(INSTALL) git $(PROGRAMS) $(SCRIPTS) $(call shellquote,$(DESTDIR)$(bindir))
448 + $(INSTALL) $(ALL_PROGRAMS) $(call shellquote,$(DESTDIR)$(bindir))
449 $(MAKE) -C templates install
450 $(INSTALL) -d -m755 $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))
451 $(INSTALL) $(PYMODULES) $(call shellquote,$(DESTDIR)$(GIT_PYTHON_DIR))