diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:20 -0700 |
| commit | e11fa9a460b51947c3ef28be84346a1e90d027ca (patch) | |
| tree | f1c218291b20b8ee96b57e4342e6d053a9e72428 /Makefile | |
| parent | 957450054cfbbe0d4ae8d33f7b74eace6e290f16 (diff) | |
| parent | 068762846634dff73a18d71188736e0ded03a1cc (diff) | |
| download | git-e11fa9a460b51947c3ef28be84346a1e90d027ca.tar.gz git-e11fa9a460b51947c3ef28be84346a1e90d027ca.tar.xz | |
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-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |