Makefile: replace most hardcoded object lists with $(wildcard)

Message ID	patch-1.1-bbacbed5c95-20211030T223011Z-avarab@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> Subject: [PATCH] Makefile: replace most hardcoded object lists with $(wildcard) Date: Sun, 31 Oct 2021 00:32:26 +0200 Message-Id: <patch-1.1-bbacbed5c95-20211030T223011Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Makefile: replace most hardcoded object lists with $(wildcard) \| expand Makefile: replace most hardcoded object lists with $(wildcard)

diff --git a/Makefile b/Makefile index 12be39ac497..2f20fa54940 100644 --- a/Makefile +++ b/Makefile @@ -590,6 +590,19 @@ TEST_OBJS = TEST_PROGRAMS_NEED_X = THIRD_PARTY_SOURCES = +## Guard against env: programs +TEST_PROGRAMS = + +## Guard against env: sources +CURL_SRC = +TEST_PROGRAMS_NEED_X_SRC = +XDIFF_SRC = + +## Guard against env: objects +ALL_COMPAT_OBJS = +CURL_OBJS = +LIB_OBJS_DIRS = + # Having this variable in your environment would break pipelines because # you cause "cd" to echo its destination to stdout. It can also take # scripts to unexpected places. If you like CDPATH, define it for your @@ -688,87 +701,23 @@ X = PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS)) -TEST_BUILTINS_OBJS += test-advise.o -TEST_BUILTINS_OBJS += test-bitmap.o -TEST_BUILTINS_OBJS += test-bloom.o -TEST_BUILTINS_OBJS += test-chmtime.o -TEST_BUILTINS_OBJS += test-config.o -TEST_BUILTINS_OBJS += test-crontab.o -TEST_BUILTINS_OBJS += test-ctype.o -TEST_BUILTINS_OBJS += test-date.o -TEST_BUILTINS_OBJS += test-delta.o -TEST_BUILTINS_OBJS += test-dir-iterator.o -TEST_BUILTINS_OBJS += test-drop-caches.o -TEST_BUILTINS_OBJS += test-dump-cache-tree.o -TEST_BUILTINS_OBJS += test-dump-fsmonitor.o -TEST_BUILTINS_OBJS += test-dump-split-index.o -TEST_BUILTINS_OBJS += test-dump-untracked-cache.o -TEST_BUILTINS_OBJS += test-example-decorate.o -TEST_BUILTINS_OBJS += test-fast-rebase.o -TEST_BUILTINS_OBJS += test-genrandom.o -TEST_BUILTINS_OBJS += test-genzeros.o -TEST_BUILTINS_OBJS += test-getcwd.o -TEST_BUILTINS_OBJS += test-hash-speed.o -TEST_BUILTINS_OBJS += test-hash.o -TEST_BUILTINS_OBJS += test-hashmap.o -TEST_BUILTINS_OBJS += test-index-version.o -TEST_BUILTINS_OBJS += test-json-writer.o -TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o -TEST_BUILTINS_OBJS += test-match-trees.o -TEST_BUILTINS_OBJS += test-mergesort.o -TEST_BUILTINS_OBJS += test-mktemp.o -TEST_BUILTINS_OBJS += test-oid-array.o -TEST_BUILTINS_OBJS += test-oidmap.o -TEST_BUILTINS_OBJS += test-oidtree.o -TEST_BUILTINS_OBJS += test-online-cpus.o -TEST_BUILTINS_OBJS += test-parse-options.o -TEST_BUILTINS_OBJS += test-parse-pathspec-file.o -TEST_BUILTINS_OBJS += test-partial-clone.o -TEST_BUILTINS_OBJS += test-path-utils.o -TEST_BUILTINS_OBJS += test-pcre2-config.o -TEST_BUILTINS_OBJS += test-pkt-line.o -TEST_BUILTINS_OBJS += test-prio-queue.o -TEST_BUILTINS_OBJS += test-proc-receive.o -TEST_BUILTINS_OBJS += test-progress.o -TEST_BUILTINS_OBJS += test-reach.o -TEST_BUILTINS_OBJS += test-read-cache.o -TEST_BUILTINS_OBJS += test-read-graph.o -TEST_BUILTINS_OBJS += test-read-midx.o -TEST_BUILTINS_OBJS += test-ref-store.o -TEST_BUILTINS_OBJS += test-regex.o -TEST_BUILTINS_OBJS += test-repository.o -TEST_BUILTINS_OBJS += test-revision-walking.o -TEST_BUILTINS_OBJS += test-run-command.o -TEST_BUILTINS_OBJS += test-scrap-cache-tree.o -TEST_BUILTINS_OBJS += test-serve-v2.o -TEST_BUILTINS_OBJS += test-sha1.o -TEST_BUILTINS_OBJS += test-sha256.o -TEST_BUILTINS_OBJS += test-sigchain.o -TEST_BUILTINS_OBJS += test-simple-ipc.o -TEST_BUILTINS_OBJS += test-strcmp-offset.o -TEST_BUILTINS_OBJS += test-string-list.o -TEST_BUILTINS_OBJS += test-submodule-config.o -TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o -TEST_BUILTINS_OBJS += test-subprocess.o -TEST_BUILTINS_OBJS += test-trace2.o -TEST_BUILTINS_OBJS += test-urlmatch-normalization.o -TEST_BUILTINS_OBJS += test-userdiff.o -TEST_BUILTINS_OBJS += test-wildmatch.o -TEST_BUILTINS_OBJS += test-windows-named-pipe.o -TEST_BUILTINS_OBJS += test-write-cache.o -TEST_BUILTINS_OBJS += test-xml-encode.o - # Do not add more tests here unless they have extra dependencies. Add # them in TEST_BUILTINS_OBJS above. TEST_PROGRAMS_NEED_X += test-fake-ssh TEST_PROGRAMS_NEED_X += test-tool -TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X)) +TEST_PROGRAMS_NEED_X_SRC += $(TEST_PROGRAMS_NEED_X:%=t/helper/%.c) +TEST_PROGRAMS += $(TEST_PROGRAMS_NEED_X_SRC:%.c=%$X) +TEST_BUILTINS_SRC += $(filter-out $(TEST_PROGRAMS_NEED_X_SRC),$(wildcard t/helper/*.c)) +TEST_BUILTINS_OBJS += $(TEST_BUILTINS_SRC:%.c=%.o) -# List built-in command $C whose implementation cmd_$C() is not in -# builtin/$C.o but is linked in as part of some other command. +# List built-in command $C whose implementation cmd_$C() is in +# builtin/$C.o +BUILTIN_OBJS = $(patsubst %.c,%.o,$(wildcard builtin/*.c)) BUILT_INS += $(patsubst builtin/%.o,git-%$X,$(BUILTIN_OBJS)) +# List built-in command $C whose implementation cmd_$C() is not in +# builtin/$C.o but is linked in as part of some other command. BUILT_INS += git-cherry$X BUILT_INS += git-cherry-pick$X BUILT_INS += git-format-patch$X @@ -828,355 +777,28 @@ LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentat -name Documentation -prune -o \ -name '*.h' -print))) -LIB_OBJS += abspath.o -LIB_OBJS += add-interactive.o -LIB_OBJS += add-patch.o -LIB_OBJS += advice.o -LIB_OBJS += alias.o -LIB_OBJS += alloc.o -LIB_OBJS += apply.o -LIB_OBJS += archive-tar.o -LIB_OBJS += archive-zip.o -LIB_OBJS += archive.o -LIB_OBJS += attr.o -LIB_OBJS += base85.o -LIB_OBJS += bisect.o -LIB_OBJS += blame.o -LIB_OBJS += blob.o -LIB_OBJS += bloom.o -LIB_OBJS += branch.o -LIB_OBJS += bulk-checkin.o -LIB_OBJS += bundle.o -LIB_OBJS += cache-tree.o -LIB_OBJS += cbtree.o -LIB_OBJS += chdir-notify.o -LIB_OBJS += checkout.o -LIB_OBJS += chunk-format.o -LIB_OBJS += color.o -LIB_OBJS += column.o -LIB_OBJS += combine-diff.o -LIB_OBJS += commit-graph.o -LIB_OBJS += commit-reach.o -LIB_OBJS += commit.o +# LIB_OBJS: compat/* objects that live at the top-level +ALL_COMPAT_OBJS += unix-socket.o +ALL_COMPAT_OBJS += unix-stream-server.o +ALL_COMPAT_OBJS += sha1dc_git.o + +# LIB_OBJS: Mostly glob *.c at the top-level, with some exlusions +LIB_OBJS += $(filter-out \ + $(ALL_COMPAT_OBJS) \ + git.o common-main.o $(PROGRAM_OBJS) \ + $(FUZZ_OBJS) $(CURL_OBJS),\ + $(patsubst %.c,%.o,$(wildcard *.c))) + +# LIB_OBJS: Directories that contain only LIB_OBJS +LIB_OBJS_DIRS += ewah +LIB_OBJS_DIRS += negotiator +LIB_OBJS_DIRS += refs +LIB_OBJS_DIRS += trace2 +LIB_OBJS += $(patsubst %.c,%.o,$(foreach dir,$(LIB_OBJS_DIRS),$(wildcard $(dir)/*.c))) + +# LIB_OBJS: unconditional compat/* objects LIB_OBJS += compat/obstack.o LIB_OBJS += compat/terminal.o -LIB_OBJS += config.o -LIB_OBJS += connect.o -LIB_OBJS += connected.o -LIB_OBJS += convert.o -LIB_OBJS += copy.o -LIB_OBJS += credential.o -LIB_OBJS += csum-file.o -LIB_OBJS += ctype.o -LIB_OBJS += date.o -LIB_OBJS += decorate.o -LIB_OBJS += delta-islands.o -LIB_OBJS += diff-delta.o -LIB_OBJS += diff-merges.o -LIB_OBJS += diff-lib.o -LIB_OBJS += diff-no-index.o -LIB_OBJS += diff.o -LIB_OBJS += diffcore-break.o -LIB_OBJS += diffcore-delta.o -LIB_OBJS += diffcore-order.o -LIB_OBJS += diffcore-pickaxe.o -LIB_OBJS += diffcore-rename.o -LIB_OBJS += diffcore-rotate.o -LIB_OBJS += dir-iterator.o -LIB_OBJS += dir.o -LIB_OBJS += editor.o -LIB_OBJS += entry.o -LIB_OBJS += environment.o -LIB_OBJS += ewah/bitmap.o -LIB_OBJS += ewah/ewah_bitmap.o -LIB_OBJS += ewah/ewah_io.o -LIB_OBJS += ewah/ewah_rlw.o -LIB_OBJS += exec-cmd.o -LIB_OBJS += fetch-negotiator.o -LIB_OBJS += fetch-pack.o -LIB_OBJS += fmt-merge-msg.o -LIB_OBJS += fsck.o -LIB_OBJS += fsmonitor.o -LIB_OBJS += gettext.o -LIB_OBJS += gpg-interface.o -LIB_OBJS += graph.o -LIB_OBJS += grep.o -LIB_OBJS += hash-lookup.o -LIB_OBJS += hashmap.o -LIB_OBJS += help.o -LIB_OBJS += hex.o -LIB_OBJS += hook.o -LIB_OBJS += ident.o -LIB_OBJS += json-writer.o -LIB_OBJS += kwset.o -LIB_OBJS += levenshtein.o -LIB_OBJS += line-log.o -LIB_OBJS += line-range.o -LIB_OBJS += linear-assignment.o -LIB_OBJS += list-objects-filter-options.o -LIB_OBJS += list-objects-filter.o -LIB_OBJS += list-objects.o -LIB_OBJS += ll-merge.o -LIB_OBJS += lockfile.o -LIB_OBJS += log-tree.o -LIB_OBJS += ls-refs.o -LIB_OBJS += mailinfo.o -LIB_OBJS += mailmap.o -LIB_OBJS += match-trees.o -LIB_OBJS += mem-pool.o -LIB_OBJS += merge-blobs.o -LIB_OBJS += merge-ort.o -LIB_OBJS += merge-ort-wrappers.o -LIB_OBJS += merge-recursive.o -LIB_OBJS += merge.o -LIB_OBJS += mergesort.o -LIB_OBJS += midx.o -LIB_OBJS += name-hash.o -LIB_OBJS += negotiator/default.o -LIB_OBJS += negotiator/noop.o -LIB_OBJS += negotiator/skipping.o -LIB_OBJS += notes-cache.o -LIB_OBJS += notes-merge.o -LIB_OBJS += notes-utils.o -LIB_OBJS += notes.o -LIB_OBJS += object-file.o -LIB_OBJS += object-name.o -LIB_OBJS += object.o -LIB_OBJS += oid-array.o -LIB_OBJS += oidmap.o -LIB_OBJS += oidset.o -LIB_OBJS += oidtree.o -LIB_OBJS += pack-bitmap-write.o -LIB_OBJS += pack-bitmap.o -LIB_OBJS += pack-check.o -LIB_OBJS += pack-objects.o -LIB_OBJS += pack-revindex.o -LIB_OBJS += pack-write.o -LIB_OBJS += packfile.o -LIB_OBJS += pager.o -LIB_OBJS += parallel-checkout.o -LIB_OBJS += parse-options-cb.o -LIB_OBJS += parse-options.o -LIB_OBJS += patch-delta.o -LIB_OBJS += patch-ids.o -LIB_OBJS += path.o -LIB_OBJS += pathspec.o -LIB_OBJS += pkt-line.o -LIB_OBJS += preload-index.o -LIB_OBJS += pretty.o -LIB_OBJS += prio-queue.o -LIB_OBJS += progress.o -LIB_OBJS += promisor-remote.o -LIB_OBJS += prompt.o -LIB_OBJS += protocol.o -LIB_OBJS += protocol-caps.o -LIB_OBJS += prune-packed.o -LIB_OBJS += quote.o -LIB_OBJS += range-diff.o -LIB_OBJS += reachable.o -LIB_OBJS += read-cache.o -LIB_OBJS += rebase-interactive.o -LIB_OBJS += rebase.o -LIB_OBJS += ref-filter.o -LIB_OBJS += reflog-walk.o -LIB_OBJS += refs.o -LIB_OBJS += refs/debug.o -LIB_OBJS += refs/files-backend.o -LIB_OBJS += refs/iterator.o -LIB_OBJS += refs/packed-backend.o -LIB_OBJS += refs/ref-cache.o -LIB_OBJS += refspec.o -LIB_OBJS += remote.o -LIB_OBJS += replace-object.o -LIB_OBJS += repo-settings.o -LIB_OBJS += repository.o -LIB_OBJS += rerere.o -LIB_OBJS += reset.o -LIB_OBJS += resolve-undo.o -LIB_OBJS += revision.o -LIB_OBJS += run-command.o -LIB_OBJS += send-pack.o -LIB_OBJS += sequencer.o -LIB_OBJS += serve.o -LIB_OBJS += server-info.o -LIB_OBJS += setup.o -LIB_OBJS += shallow.o -LIB_OBJS += sideband.o -LIB_OBJS += sigchain.o -LIB_OBJS += sparse-index.o -LIB_OBJS += split-index.o -LIB_OBJS += stable-qsort.o -LIB_OBJS += strbuf.o -LIB_OBJS += streaming.o -LIB_OBJS += string-list.o -LIB_OBJS += strmap.o -LIB_OBJS += strvec.o -LIB_OBJS += sub-process.o -LIB_OBJS += submodule-config.o -LIB_OBJS += submodule.o -LIB_OBJS += symlinks.o -LIB_OBJS += tag.o -LIB_OBJS += tempfile.o -LIB_OBJS += thread-utils.o -LIB_OBJS += tmp-objdir.o -LIB_OBJS += trace.o -LIB_OBJS += trace2.o -LIB_OBJS += trace2/tr2_cfg.o -LIB_OBJS += trace2/tr2_cmd_name.o -LIB_OBJS += trace2/tr2_dst.o -LIB_OBJS += trace2/tr2_sid.o -LIB_OBJS += trace2/tr2_sysenv.o -LIB_OBJS += trace2/tr2_tbuf.o -LIB_OBJS += trace2/tr2_tgt_event.o -LIB_OBJS += trace2/tr2_tgt_normal.o -LIB_OBJS += trace2/tr2_tgt_perf.o -LIB_OBJS += trace2/tr2_tls.o -LIB_OBJS += trailer.o -LIB_OBJS += transport-helper.o -LIB_OBJS += transport.o -LIB_OBJS += tree-diff.o -LIB_OBJS += tree-walk.o -LIB_OBJS += tree.o -LIB_OBJS += unpack-trees.o -LIB_OBJS += upload-pack.o -LIB_OBJS += url.o -LIB_OBJS += urlmatch.o -LIB_OBJS += usage.o -LIB_OBJS += userdiff.o -LIB_OBJS += utf8.o -LIB_OBJS += varint.o -LIB_OBJS += version.o -LIB_OBJS += versioncmp.o -LIB_OBJS += walker.o -LIB_OBJS += wildmatch.o -LIB_OBJS += worktree.o -LIB_OBJS += wrapper.o -LIB_OBJS += write-or-die.o -LIB_OBJS += ws.o -LIB_OBJS += wt-status.o -LIB_OBJS += xdiff-interface.o -LIB_OBJS += zlib.o - -BUILTIN_OBJS += builtin/add.o -BUILTIN_OBJS += builtin/am.o -BUILTIN_OBJS += builtin/annotate.o -BUILTIN_OBJS += builtin/apply.o -BUILTIN_OBJS += builtin/archive.o -BUILTIN_OBJS += builtin/bisect--helper.o -BUILTIN_OBJS += builtin/blame.o -BUILTIN_OBJS += builtin/branch.o -BUILTIN_OBJS += builtin/bugreport.o -BUILTIN_OBJS += builtin/bundle.o -BUILTIN_OBJS += builtin/cat-file.o -BUILTIN_OBJS += builtin/check-attr.o -BUILTIN_OBJS += builtin/check-ignore.o -BUILTIN_OBJS += builtin/check-mailmap.o -BUILTIN_OBJS += builtin/check-ref-format.o -BUILTIN_OBJS += builtin/checkout--worker.o -BUILTIN_OBJS += builtin/checkout-index.o -BUILTIN_OBJS += builtin/checkout.o -BUILTIN_OBJS += builtin/clean.o -BUILTIN_OBJS += builtin/clone.o -BUILTIN_OBJS += builtin/column.o -BUILTIN_OBJS += builtin/commit-graph.o -BUILTIN_OBJS += builtin/commit-tree.o -BUILTIN_OBJS += builtin/commit.o -BUILTIN_OBJS += builtin/config.o -BUILTIN_OBJS += builtin/count-objects.o -BUILTIN_OBJS += builtin/credential-cache--daemon.o -BUILTIN_OBJS += builtin/credential-cache.o -BUILTIN_OBJS += builtin/credential-store.o -BUILTIN_OBJS += builtin/credential.o -BUILTIN_OBJS += builtin/describe.o -BUILTIN_OBJS += builtin/diff-files.o -BUILTIN_OBJS += builtin/diff-index.o -BUILTIN_OBJS += builtin/diff-tree.o -BUILTIN_OBJS += builtin/diff.o -BUILTIN_OBJS += builtin/difftool.o -BUILTIN_OBJS += builtin/env--helper.o -BUILTIN_OBJS += builtin/fast-export.o -BUILTIN_OBJS += builtin/fast-import.o -BUILTIN_OBJS += builtin/fetch-pack.o -BUILTIN_OBJS += builtin/fetch.o -BUILTIN_OBJS += builtin/fmt-merge-msg.o -BUILTIN_OBJS += builtin/for-each-ref.o -BUILTIN_OBJS += builtin/for-each-repo.o -BUILTIN_OBJS += builtin/fsck.o -BUILTIN_OBJS += builtin/gc.o -BUILTIN_OBJS += builtin/get-tar-commit-id.o -BUILTIN_OBJS += builtin/grep.o -BUILTIN_OBJS += builtin/hash-object.o -BUILTIN_OBJS += builtin/help.o -BUILTIN_OBJS += builtin/index-pack.o -BUILTIN_OBJS += builtin/init-db.o -BUILTIN_OBJS += builtin/interpret-trailers.o -BUILTIN_OBJS += builtin/log.o -BUILTIN_OBJS += builtin/ls-files.o -BUILTIN_OBJS += builtin/ls-remote.o -BUILTIN_OBJS += builtin/ls-tree.o -BUILTIN_OBJS += builtin/mailinfo.o -BUILTIN_OBJS += builtin/mailsplit.o -BUILTIN_OBJS += builtin/merge-base.o -BUILTIN_OBJS += builtin/merge-file.o -BUILTIN_OBJS += builtin/merge-index.o -BUILTIN_OBJS += builtin/merge-ours.o -BUILTIN_OBJS += builtin/merge-recursive.o -BUILTIN_OBJS += builtin/merge-tree.o -BUILTIN_OBJS += builtin/merge.o -BUILTIN_OBJS += builtin/mktag.o -BUILTIN_OBJS += builtin/mktree.o -BUILTIN_OBJS += builtin/multi-pack-index.o -BUILTIN_OBJS += builtin/mv.o -BUILTIN_OBJS += builtin/name-rev.o -BUILTIN_OBJS += builtin/notes.o -BUILTIN_OBJS += builtin/pack-objects.o -BUILTIN_OBJS += builtin/pack-redundant.o -BUILTIN_OBJS += builtin/pack-refs.o -BUILTIN_OBJS += builtin/patch-id.o -BUILTIN_OBJS += builtin/prune-packed.o -BUILTIN_OBJS += builtin/prune.o -BUILTIN_OBJS += builtin/pull.o -BUILTIN_OBJS += builtin/push.o -BUILTIN_OBJS += builtin/range-diff.o -BUILTIN_OBJS += builtin/read-tree.o -BUILTIN_OBJS += builtin/rebase.o -BUILTIN_OBJS += builtin/receive-pack.o -BUILTIN_OBJS += builtin/reflog.o -BUILTIN_OBJS += builtin/remote-ext.o -BUILTIN_OBJS += builtin/remote-fd.o -BUILTIN_OBJS += builtin/remote.o -BUILTIN_OBJS += builtin/repack.o -BUILTIN_OBJS += builtin/replace.o -BUILTIN_OBJS += builtin/rerere.o -BUILTIN_OBJS += builtin/reset.o -BUILTIN_OBJS += builtin/rev-list.o -BUILTIN_OBJS += builtin/rev-parse.o -BUILTIN_OBJS += builtin/revert.o -BUILTIN_OBJS += builtin/rm.o -BUILTIN_OBJS += builtin/send-pack.o -BUILTIN_OBJS += builtin/shortlog.o -BUILTIN_OBJS += builtin/show-branch.o -BUILTIN_OBJS += builtin/show-index.o -BUILTIN_OBJS += builtin/show-ref.o -BUILTIN_OBJS += builtin/sparse-checkout.o -BUILTIN_OBJS += builtin/stash.o -BUILTIN_OBJS += builtin/stripspace.o -BUILTIN_OBJS += builtin/submodule--helper.o -BUILTIN_OBJS += builtin/symbolic-ref.o -BUILTIN_OBJS += builtin/tag.o -BUILTIN_OBJS += builtin/unpack-file.o -BUILTIN_OBJS += builtin/unpack-objects.o -BUILTIN_OBJS += builtin/update-index.o -BUILTIN_OBJS += builtin/update-ref.o -BUILTIN_OBJS += builtin/update-server-info.o -BUILTIN_OBJS += builtin/upload-archive.o -BUILTIN_OBJS += builtin/upload-pack.o -BUILTIN_OBJS += builtin/var.o -BUILTIN_OBJS += builtin/verify-commit.o -BUILTIN_OBJS += builtin/verify-pack.o -BUILTIN_OBJS += builtin/verify-tag.o -BUILTIN_OBJS += builtin/worktree.o -BUILTIN_OBJS += builtin/write-tree.o # THIRD_PARTY_SOURCES is a list of patterns compatible with the # $(filter) and $(filter-out) family of functions. They specify source @@ -2427,17 +2049,12 @@ reconfigure config.mak.autogen: config.status .PHONY: reconfigure # This is a convenience target. endif -XDIFF_OBJS += xdiff/xdiffi.o -XDIFF_OBJS += xdiff/xemit.o -XDIFF_OBJS += xdiff/xhistogram.o -XDIFF_OBJS += xdiff/xmerge.o -XDIFF_OBJS += xdiff/xpatience.o -XDIFF_OBJS += xdiff/xprepare.o -XDIFF_OBJS += xdiff/xutils.o +XDIFF_SRC += $(wildcard xdiff/*.c) +XDIFF_OBJS += $(XDIFF_SRC:.c=.o) .PHONY: xdiff-objs xdiff-objs: $(XDIFF_OBJS) -TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS)) +TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(TEST_BUILTINS_OBJS) .PHONY: test-objs test-objs: $(TEST_OBJS) @@ -2448,13 +2065,20 @@ GIT_OBJS += git.o .PHONY: git-objs git-objs: $(GIT_OBJS) +CURL_SRC += http.c +CURL_SRC += http-walker.c +CURL_SRC += remote-curl.c +CURL_OBJS += $(CURL_SRC:.c=.o) +.PHONY: curl-objs +curl-objs: $(CURL_OBJS) + OBJECTS += $(GIT_OBJS) OBJECTS += $(PROGRAM_OBJS) OBJECTS += $(TEST_OBJS) OBJECTS += $(XDIFF_OBJS) OBJECTS += $(FUZZ_OBJS) ifndef NO_CURL - OBJECTS += http.o http-walker.o remote-curl.o +OBJECTS += $(CURL_OBJS) endif .PHONY: objects objects: $(OBJECTS) @@ -2891,7 +2515,7 @@ perf: all .PRECIOUS: $(TEST_OBJS) -t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS)) +t/helper/test-tool$X: $(TEST_BUILTINS_OBJS) t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)

Makefile: replace most hardcoded object lists with $(wildcard)

Commit Message

Comments

Patch