74ca5e6d7c · matheusbsbs/matheus-bagliano

@@ -229,59 +229,84 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__

229 BASIC_CFLAGS =

230 BASIC_LDFLAGS =

231

232 -SCRIPT_SH = \

233 - git-bisect.sh \

234 - git-clone.sh \

235 - git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \

236 - git-pull.sh git-rebase.sh git-rebase--interactive.sh \

237 - git-repack.sh git-request-pull.sh \

238 - git-sh-setup.sh \

239 - git-am.sh \

240 - git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \

241 - git-merge-resolve.sh \

242 - git-lost-found.sh git-quiltimport.sh git-submodule.sh \

243 - git-filter-branch.sh \

244 - git-stash.sh \

245 - git-web--browse.sh

246 -

247 -SCRIPT_PERL = \

248 - git-add--interactive.perl \

249 - git-archimport.perl git-cvsimport.perl git-relink.perl \

250 - git-cvsserver.perl git-cvsexportcommit.perl \

251 - git-send-email.perl git-svn.perl

232 +SCRIPT_SH += git-am.sh

233 +SCRIPT_SH += git-bisect.sh

234 +SCRIPT_SH += git-clone.sh

235 +SCRIPT_SH += git-filter-branch.sh

236 +SCRIPT_SH += git-lost-found.sh

237 +SCRIPT_SH += git-merge-octopus.sh

238 +SCRIPT_SH += git-merge-one-file.sh

239 +SCRIPT_SH += git-merge-resolve.sh

240 +SCRIPT_SH += git-merge.sh

241 +SCRIPT_SH += git-merge-stupid.sh

242 +SCRIPT_SH += git-mergetool.sh

243 +SCRIPT_SH += git-parse-remote.sh

244 +SCRIPT_SH += git-pull.sh

245 +SCRIPT_SH += git-quiltimport.sh

246 +SCRIPT_SH += git-rebase--interactive.sh

247 +SCRIPT_SH += git-rebase.sh

248 +SCRIPT_SH += git-repack.sh

249 +SCRIPT_SH += git-request-pull.sh

250 +SCRIPT_SH += git-sh-setup.sh

251 +SCRIPT_SH += git-stash.sh

252 +SCRIPT_SH += git-submodule.sh

253 +SCRIPT_SH += git-web--browse.sh

254 +

255 +SCRIPT_PERL += git-add--interactive.perl

256 +SCRIPT_PERL += git-archimport.perl

257 +SCRIPT_PERL += git-cvsexportcommit.perl

258 +SCRIPT_PERL += git-cvsimport.perl

259 +SCRIPT_PERL += git-cvsserver.perl

260 +SCRIPT_PERL += git-relink.perl

261 +SCRIPT_PERL += git-send-email.perl

262 +SCRIPT_PERL += git-svn.perl

263

264 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \

265 $(patsubst %.perl,%,$(SCRIPT_PERL)) \

266 git-instaweb

267

257 -# ... and all the rest that could be moved out of bindir to gitexecdir

258 -PROGRAMS = \

259 - git-fetch-pack$X \

260 - git-hash-object$X git-index-pack$X \

261 - git-fast-import$X \

262 - git-daemon$X \

263 - git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \

264 - git-receive-pack$X \

265 - git-send-pack$X git-shell$X \

266 - git-show-index$X \

267 - git-unpack-file$X \

268 - git-update-server-info$X \

269 - git-upload-pack$X \

270 - git-pack-redundant$X git-var$X \

271 - git-merge-tree$X git-imap-send$X \

272 - $(EXTRA_PROGRAMS)

273 -

268 # Empty...

269 EXTRA_PROGRAMS =

270

271 +# ... and all the rest that could be moved out of bindir to gitexecdir

272 +PROGRAMS += $(EXTRA_PROGRAMS)

273 +PROGRAMS += git-daemon$X

274 +PROGRAMS += git-fast-import$X

275 +PROGRAMS += git-fetch-pack$X

276 +PROGRAMS += git-hash-object$X

277 +PROGRAMS += git-imap-send$X

278 +PROGRAMS += git-index-pack$X

279 +PROGRAMS += git-merge-index$X

280 +PROGRAMS += git-merge-tree$X

281 +PROGRAMS += git-mktag$X

282 +PROGRAMS += git-mktree$X

283 +PROGRAMS += git-pack-redundant$X

284 +PROGRAMS += git-patch-id$X

285 +PROGRAMS += git-receive-pack$X

286 +PROGRAMS += git-send-pack$X

287 +PROGRAMS += git-shell$X

288 +PROGRAMS += git-show-index$X

289 +PROGRAMS += git-unpack-file$X

290 +PROGRAMS += git-update-server-info$X

291 +PROGRAMS += git-upload-pack$X

292 +PROGRAMS += git-var$X

293 +

294 # List built-in command $C whose implementation cmd_$C() is not in

295 # builtin-$C.o but is linked in as part of some other command.

279 -BUILT_INS = \

280 - git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \

281 - git-get-tar-commit-id$X git-init$X git-repo-config$X \

282 - git-fsck-objects$X git-cherry-pick$X git-peek-remote$X git-status$X \

283 - git-merge-subtree$X \

284 - $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))

296 +BUILT_INS += $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))

297 +

298 +BUILT_INS += git-cherry-pick$X

299 +BUILT_INS += git-cherry$X

300 +BUILT_INS += git-format-patch$X

301 +BUILT_INS += git-fsck-objects$X

302 +BUILT_INS += git-get-tar-commit-id$X

303 +BUILT_INS += git-init$X

304 +BUILT_INS += git-merge-subtree$X

305 +BUILT_INS += git-peek-remote$X

306 +BUILT_INS += git-repo-config$X

307 +BUILT_INS += git-show$X

308 +BUILT_INS += git-status$X

309 +BUILT_INS += git-whatchanged$X

310

311 # what 'all' will build and 'install' will install, in gitexecdir

312 ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)

@@ -302,111 +327,214 @@ export PERL_PATH

327 LIB_FILE=libgit.a

328 XDIFF_LIB=xdiff/lib.a

329

305 -LIB_H = \

306 - archive.h blob.h cache.h cache-tree.h commit.h csum-file.h delta.h grep.h \

307 - diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \

308 - run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \

309 - tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \

310 - utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \

311 - mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h fsck.h \

312 - pack-revindex.h

313 -

314 -LIB_OBJS = \

315 - blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \

316 - date.o diff-delta.o entry.o exec_cmd.o ident.o \

317 - pretty.o interpolate.o hash.o \

318 - lockfile.o \

319 - patch-ids.o \

320 - object.o pack-check.o pack-write.o patch-delta.o path.o pkt-line.o \

321 - sideband.o reachable.o reflog-walk.o \

322 - quote.o read-cache.o refs.o run-command.o dir.o \

323 - server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \

324 - tag.o tree.o usage.o config.o environment.o ctype.o copy.o \

325 - revision.o pager.o tree-walk.o xdiff-interface.o \

326 - write_or_die.o trace.o list-objects.o grep.o match-trees.o \

327 - alloc.o merge-file.o path-list.o help.o unpack-trees.o \

328 - color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \

329 - convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \

330 - transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \

331 - ll-merge.o alias.o fsck.o pack-revindex.o \

332 - diff.o diff-lib.o diffcore-break.o diffcore-order.o \

333 - diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \

334 - diffcore-delta.o log-tree.o

335 -

336 -BUILTIN_OBJS = \

337 - builtin-add.o \

338 - builtin-annotate.o \

339 - builtin-apply.o \

340 - builtin-archive.o \

341 - builtin-blame.o \

342 - builtin-branch.o \

343 - builtin-bundle.o \

344 - builtin-cat-file.o \

345 - builtin-check-attr.o \

346 - builtin-checkout.o \

347 - builtin-checkout-index.o \

348 - builtin-check-ref-format.o \

349 - builtin-clean.o \

350 - builtin-commit.o \

351 - builtin-commit-tree.o \

352 - builtin-count-objects.o \

353 - builtin-describe.o \

354 - builtin-diff.o \

355 - builtin-diff-files.o \

356 - builtin-diff-index.o \

357 - builtin-diff-tree.o \

358 - builtin-fast-export.o \

359 - builtin-fetch.o \

360 - builtin-fetch-pack.o \

361 - builtin-fetch--tool.o \

362 - builtin-fmt-merge-msg.o \

363 - builtin-for-each-ref.o \

364 - builtin-fsck.o \

365 - builtin-gc.o \

366 - builtin-grep.o \

367 - builtin-init-db.o \

368 - builtin-log.o \

369 - builtin-ls-files.o \

370 - builtin-ls-tree.o \

371 - builtin-ls-remote.o \

372 - builtin-mailinfo.o \

373 - builtin-mailsplit.o \

374 - builtin-merge-base.o \

375 - builtin-merge-file.o \

376 - builtin-merge-ours.o \

377 - builtin-merge-recursive.o \

378 - builtin-mv.o \

379 - builtin-name-rev.o \

380 - builtin-pack-objects.o \

381 - builtin-prune.o \

382 - builtin-prune-packed.o \

383 - builtin-push.o \

384 - builtin-read-tree.o \

385 - builtin-reflog.o \

386 - builtin-remote.o \

387 - builtin-send-pack.o \

388 - builtin-config.o \

389 - builtin-rerere.o \

390 - builtin-reset.o \

391 - builtin-rev-list.o \

392 - builtin-rev-parse.o \

393 - builtin-revert.o \

394 - builtin-rm.o \

395 - builtin-shortlog.o \

396 - builtin-show-branch.o \

397 - builtin-stripspace.o \

398 - builtin-symbolic-ref.o \

399 - builtin-tag.o \

400 - builtin-tar-tree.o \

401 - builtin-unpack-objects.o \

402 - builtin-update-index.o \

403 - builtin-update-ref.o \

404 - builtin-upload-archive.o \

405 - builtin-verify-pack.o \

406 - builtin-verify-tag.o \

407 - builtin-write-tree.o \

408 - builtin-show-ref.o \

409 - builtin-pack-refs.o

330 +LIB_H += archive.h

331 +LIB_H += attr.h

332 +LIB_H += blob.h

333 +LIB_H += builtin.h

334 +LIB_H += cache.h

335 +LIB_H += cache-tree.h

336 +LIB_H += commit.h

337 +LIB_H += csum-file.h

338 +LIB_H += decorate.h

339 +LIB_H += delta.h

340 +LIB_H += diffcore.h

341 +LIB_H += diff.h

342 +LIB_H += dir.h

343 +LIB_H += fsck.h

344 +LIB_H += git-compat-util.h

345 +LIB_H += grep.h

346 +LIB_H += hash.h

347 +LIB_H += list-objects.h

348 +LIB_H += ll-merge.h

349 +LIB_H += log-tree.h

350 +LIB_H += mailmap.h

351 +LIB_H += object.h

352 +LIB_H += pack.h

353 +LIB_H += pack-revindex.h

354 +LIB_H += parse-options.h

355 +LIB_H += patch-ids.h

356 +LIB_H += path-list.h

357 +LIB_H += pkt-line.h

358 +LIB_H += progress.h

359 +LIB_H += quote.h

360 +LIB_H += reflog-walk.h

361 +LIB_H += refs.h

362 +LIB_H += remote.h

363 +LIB_H += revision.h

364 +LIB_H += run-command.h

365 +LIB_H += sideband.h

366 +LIB_H += strbuf.h

367 +LIB_H += tag.h

368 +LIB_H += transport.h

369 +LIB_H += tree.h

370 +LIB_H += tree-walk.h

371 +LIB_H += unpack-trees.h

372 +LIB_H += utf8.h

373 +

374 +LIB_OBJS += alias.o

375 +LIB_OBJS += alloc.o

376 +LIB_OBJS += archive.o

377 +LIB_OBJS += archive-tar.o

378 +LIB_OBJS += archive-zip.o

379 +LIB_OBJS += attr.o

380 +LIB_OBJS += base85.o

381 +LIB_OBJS += blob.o

382 +LIB_OBJS += branch.o

383 +LIB_OBJS += bundle.o

384 +LIB_OBJS += cache-tree.o

385 +LIB_OBJS += color.o

386 +LIB_OBJS += combine-diff.o

387 +LIB_OBJS += commit.o

388 +LIB_OBJS += config.o

389 +LIB_OBJS += connect.o

390 +LIB_OBJS += convert.o

391 +LIB_OBJS += copy.o

392 +LIB_OBJS += csum-file.o

393 +LIB_OBJS += ctype.o

394 +LIB_OBJS += date.o

395 +LIB_OBJS += decorate.o

396 +LIB_OBJS += diffcore-break.o

397 +LIB_OBJS += diffcore-delta.o

398 +LIB_OBJS += diffcore-order.o

399 +LIB_OBJS += diffcore-pickaxe.o

400 +LIB_OBJS += diffcore-rename.o

401 +LIB_OBJS += diff-delta.o

402 +LIB_OBJS += diff-lib.o

403 +LIB_OBJS += diff.o

404 +LIB_OBJS += dir.o

405 +LIB_OBJS += entry.o

406 +LIB_OBJS += environment.o

407 +LIB_OBJS += exec_cmd.o

408 +LIB_OBJS += fsck.o

409 +LIB_OBJS += grep.o

410 +LIB_OBJS += hash.o

411 +LIB_OBJS += help.o

412 +LIB_OBJS += ident.o

413 +LIB_OBJS += interpolate.o

414 +LIB_OBJS += list-objects.o

415 +LIB_OBJS += ll-merge.o

416 +LIB_OBJS += lockfile.o

417 +LIB_OBJS += log-tree.o

418 +LIB_OBJS += mailmap.o

419 +LIB_OBJS += match-trees.o

420 +LIB_OBJS += merge-file.o

421 +LIB_OBJS += object.o

422 +LIB_OBJS += pack-check.o

423 +LIB_OBJS += pack-revindex.o

424 +LIB_OBJS += pack-write.o

425 +LIB_OBJS += pager.o

426 +LIB_OBJS += parse-options.o

427 +LIB_OBJS += patch-delta.o

428 +LIB_OBJS += patch-ids.o

429 +LIB_OBJS += path-list.o

430 +LIB_OBJS += path.o

431 +LIB_OBJS += pkt-line.o

432 +LIB_OBJS += pretty.o

433 +LIB_OBJS += progress.o

434 +LIB_OBJS += quote.o

435 +LIB_OBJS += reachable.o

436 +LIB_OBJS += read-cache.o

437 +LIB_OBJS += reflog-walk.o

438 +LIB_OBJS += refs.o

439 +LIB_OBJS += remote.o

440 +LIB_OBJS += revision.o

441 +LIB_OBJS += run-command.o

442 +LIB_OBJS += server-info.o

443 +LIB_OBJS += setup.o

444 +LIB_OBJS += sha1_file.o

445 +LIB_OBJS += sha1_name.o

446 +LIB_OBJS += shallow.o

447 +LIB_OBJS += sideband.o

448 +LIB_OBJS += strbuf.o

449 +LIB_OBJS += symlinks.o

450 +LIB_OBJS += tag.o

451 +LIB_OBJS += trace.o

452 +LIB_OBJS += transport.o

453 +LIB_OBJS += tree-diff.o

454 +LIB_OBJS += tree.o

455 +LIB_OBJS += tree-walk.o

456 +LIB_OBJS += unpack-trees.o

457 +LIB_OBJS += usage.o

458 +LIB_OBJS += utf8.o

459 +LIB_OBJS += walker.o

460 +LIB_OBJS += write_or_die.o

461 +LIB_OBJS += ws.o

462 +LIB_OBJS += wt-status.o

463 +LIB_OBJS += xdiff-interface.o

464 +

465 +BUILTIN_OBJS += builtin-add.o

466 +BUILTIN_OBJS += builtin-annotate.o

467 +BUILTIN_OBJS += builtin-apply.o

468 +BUILTIN_OBJS += builtin-archive.o

469 +BUILTIN_OBJS += builtin-blame.o

470 +BUILTIN_OBJS += builtin-branch.o

471 +BUILTIN_OBJS += builtin-bundle.o

472 +BUILTIN_OBJS += builtin-cat-file.o

473 +BUILTIN_OBJS += builtin-check-attr.o

474 +BUILTIN_OBJS += builtin-check-ref-format.o

475 +BUILTIN_OBJS += builtin-checkout-index.o

476 +BUILTIN_OBJS += builtin-checkout.o

477 +BUILTIN_OBJS += builtin-clean.o

478 +BUILTIN_OBJS += builtin-commit-tree.o

479 +BUILTIN_OBJS += builtin-commit.o

480 +BUILTIN_OBJS += builtin-config.o

481 +BUILTIN_OBJS += builtin-count-objects.o

482 +BUILTIN_OBJS += builtin-describe.o

483 +BUILTIN_OBJS += builtin-diff-files.o

484 +BUILTIN_OBJS += builtin-diff-index.o

485 +BUILTIN_OBJS += builtin-diff-tree.o

486 +BUILTIN_OBJS += builtin-diff.o

487 +BUILTIN_OBJS += builtin-fast-export.o

488 +BUILTIN_OBJS += builtin-fetch--tool.o

489 +BUILTIN_OBJS += builtin-fetch-pack.o

490 +BUILTIN_OBJS += builtin-fetch.o

491 +BUILTIN_OBJS += builtin-fmt-merge-msg.o

492 +BUILTIN_OBJS += builtin-for-each-ref.o

493 +BUILTIN_OBJS += builtin-fsck.o

494 +BUILTIN_OBJS += builtin-gc.o

495 +BUILTIN_OBJS += builtin-grep.o

496 +BUILTIN_OBJS += builtin-init-db.o

497 +BUILTIN_OBJS += builtin-log.o

498 +BUILTIN_OBJS += builtin-ls-files.o

499 +BUILTIN_OBJS += builtin-ls-remote.o

500 +BUILTIN_OBJS += builtin-ls-tree.o

501 +BUILTIN_OBJS += builtin-mailinfo.o

502 +BUILTIN_OBJS += builtin-mailsplit.o

503 +BUILTIN_OBJS += builtin-merge-base.o

504 +BUILTIN_OBJS += builtin-merge-file.o

505 +BUILTIN_OBJS += builtin-merge-ours.o

506 +BUILTIN_OBJS += builtin-merge-recursive.o

507 +BUILTIN_OBJS += builtin-mv.o

508 +BUILTIN_OBJS += builtin-name-rev.o

509 +BUILTIN_OBJS += builtin-pack-objects.o

510 +BUILTIN_OBJS += builtin-pack-refs.o

511 +BUILTIN_OBJS += builtin-prune-packed.o

512 +BUILTIN_OBJS += builtin-prune.o

513 +BUILTIN_OBJS += builtin-push.o

514 +BUILTIN_OBJS += builtin-read-tree.o

515 +BUILTIN_OBJS += builtin-reflog.o

516 +BUILTIN_OBJS += builtin-remote.o

517 +BUILTIN_OBJS += builtin-rerere.o

518 +BUILTIN_OBJS += builtin-reset.o

519 +BUILTIN_OBJS += builtin-rev-list.o

520 +BUILTIN_OBJS += builtin-rev-parse.o

521 +BUILTIN_OBJS += builtin-revert.o

522 +BUILTIN_OBJS += builtin-rm.o

523 +BUILTIN_OBJS += builtin-send-pack.o

524 +BUILTIN_OBJS += builtin-shortlog.o

525 +BUILTIN_OBJS += builtin-show-branch.o

526 +BUILTIN_OBJS += builtin-show-ref.o

527 +BUILTIN_OBJS += builtin-stripspace.o

528 +BUILTIN_OBJS += builtin-symbolic-ref.o

529 +BUILTIN_OBJS += builtin-tag.o

530 +BUILTIN_OBJS += builtin-tar-tree.o

531 +BUILTIN_OBJS += builtin-unpack-objects.o

532 +BUILTIN_OBJS += builtin-update-index.o

533 +BUILTIN_OBJS += builtin-update-ref.o

534 +BUILTIN_OBJS += builtin-upload-archive.o

535 +BUILTIN_OBJS += builtin-verify-pack.o

536 +BUILTIN_OBJS += builtin-verify-tag.o

537 +BUILTIN_OBJS += builtin-write-tree.o

538

539 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)

540 EXTLIBS =

Makefile: flatten enumeration of headers, objects and programs