summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-26 01:00:20 +0200
committerJunio C Hamano <gitster@pobox.com>2011-08-26 01:00:20 +0200
commite11fa9a460b51947c3ef28be84346a1e90d027ca (patch)
treef1c218291b20b8ee96b57e4342e6d053a9e72428 /Makefile
parentMerge branch 'js/i18n-scripts' (diff)
parentReduce parse-options.o dependencies (diff)
downloadgit-e11fa9a460b51947c3ef28be84346a1e90d027ca.tar.xz
git-e11fa9a460b51947c3ef28be84346a1e90d027ca.zip
Merge branch 'di/parse-options-split'
* di/parse-options-split: Reduce parse-options.o dependencies parse-options: export opterr, optbug
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 89cc6245a7..7149d46e9c 100644
--- a/Makefile
+++ b/Makefile
@@ -642,6 +642,7 @@ LIB_OBJS += pack-revindex.o
LIB_OBJS += pack-write.o
LIB_OBJS += pager.o
LIB_OBJS += parse-options.o
+LIB_OBJS += parse-options-cb.o
LIB_OBJS += patch-delta.o
LIB_OBJS += patch-ids.o
LIB_OBJS += path.o
@@ -2204,7 +2205,7 @@ test-delta$X: diff-delta.o patch-delta.o
test-line-buffer$X: vcs-svn/lib.a
-test-parse-options$X: parse-options.o
+test-parse-options$X: parse-options.o parse-options-cb.o
test-string-pool$X: vcs-svn/lib.a