aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-16 14:00:34 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-16 14:00:34 -0700
commit8e3abd4c97b8e7e1128ad0cc44dcc267f478659a (patch)
tree30a2e67ff9bd08b242c329a8bacc00b9dd0e16f6 /Makefile
parent500a99935dc157a6625b4decae0b97e896061c2c (diff)
parent0fc82cff12a887c1e0e7e69937dbd8a82843c081 (diff)
downloadgit-8e3abd4c97b8e7e1128ad0cc44dcc267f478659a.tar.gz
git-8e3abd4c97b8e7e1128ad0cc44dcc267f478659a.tar.xz
Merge branch 'jc/racy'
* jc/racy: Remove the "delay writing to avoid runtime penalty of racy-git avoidance" Add check program "git-check-racy" Documentation/technical/racy-git.txt avoid nanosleep(2)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 56a915e13..23cd8a017 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,11 @@ PROGRAMS = \
git-update-server-info$X \
git-upload-pack$X git-verify-pack$X \
git-pack-redundant$X git-var$X \
- git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
+ git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
+ $(EXTRA_PROGRAMS)
+
+# Empty...
+EXTRA_PROGRAMS =
BUILT_INS = \
git-format-patch$X git-show$X git-whatchanged$X \