[PATCH v4] osxkeychain: define build targets in the top-level Makefile.

From: Koji Nakamaru <koji.nakamaru@gree.net>

The fix for git-credential-osxkeychain in 4580bcd235 (osxkeychain: avoid incorrectly skipping store operation, 2025-11-14) introduced linkage with libgit.a, and its Makefile was adjusted accordingly. However, the build fails as of 864f55e190 because several macOS-specific refinements were applied to the top-level Makefile and config.mak.uname, such as:

  - 363837afe7 (macOS: make Homebrew use configurable, 2025-12-24)
  - cee341e9dd (macOS: use iconv from Homebrew if needed and present,
    2025-12-24)
  - d281241518 (utf8.c: enable workaround for iconv under macOS 14/15,
    2026-01-12)

Since libgit.a and its corresponding header files depend on many flags defined in the top-level Makefile, these flags must be consistently defined when building git-credential-osxkeychain. Continuing to manually adjust the git-credential-osxkeychain Makefile is cumbersome and fragile.

Define the build targets for git-credential-osxkeychain in the top-level Makefile and modify its local Makefile to simply rely on those targets.

Helped-by: Junio C Hamano <gitster@pobox.com>
Reported-by: D. Ben Knoble <ben.knoble@gmail.com>
Helped-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Signed-off-by: Koji Nakamaru <koji.nakamaru@gree.net>
---
    osxkeychain: define build targets in the top-level Makefile.
    
    Changes since v3:
    
     * Add missing commit reference date.
     * Use dep_dirs to create contrib/credential/osxkeychain/.depend.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2046%2FKojiNakamaru%2Ffix%2Fosxkeychain-makefile-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2046/KojiNakamaru/fix/osxkeychain-makefile-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/2046

Range-diff vs v3:

 1:  25a66e1b7d ! 1:  3c36804348 osxkeychain: define build targets in the top-level Makefile.
     @@ Commit message
          osxkeychain: define build targets in the top-level Makefile.
      
          The fix for git-credential-osxkeychain in 4580bcd235 (osxkeychain: avoid
     -    incorrectly skipping store operation) introduced linkage with libgit.a,
     -    and its Makefile was adjusted accordingly. However, the build fails as
     -    of 864f55e190 because several macOS-specific refinements were applied to
     -    the top-level Makefile and config.mak.uname, such as:
     +    incorrectly skipping store operation, 2025-11-14) introduced linkage
     +    with libgit.a, and its Makefile was adjusted accordingly. However, the
     +    build fails as of 864f55e190 because several macOS-specific refinements
     +    were applied to the top-level Makefile and config.mak.uname, such as:
      
            - 363837afe7 (macOS: make Homebrew use configurable, 2025-12-24)
            - cee341e9dd (macOS: use iconv from Homebrew if needed and present,
     @@ Commit message
      
          Helped-by: Junio C Hamano <gitster@pobox.com>
          Reported-by: D. Ben Knoble <ben.knoble@gmail.com>
     +    Helped-by: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
          Signed-off-by: Koji Nakamaru <koji.nakamaru@gree.net>
      
       ## Makefile ##
     +@@ Makefile: objects: $(OBJECTS)
     + dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
     + dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
     + 
     ++ifeq ($(uname_S),Darwin)
     ++	dep_dirs += $(addsuffix .depend,$(sort $(dir contrib/credential/osxkeychain/git-credential-osxkeychain.o)))
     ++endif
     ++
     + ifeq ($(COMPUTE_HEADER_DEPENDENCIES),yes)
     + $(dep_dirs):
     + 	@mkdir -p $@
      @@ Makefile: $(LIBGIT_HIDDEN_EXPORT): $(LIBGIT_PARTIAL_EXPORT)
       
       contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT)
     @@ Makefile: $(LIBGIT_HIDDEN_EXPORT): $(LIBGIT_PARTIAL_EXPORT)
      +		$(filter %.o,$^) $(LIB_FILE) $(EXTLIBS) -framework Security -framework CoreFoundation
      +
      +contrib/credential/osxkeychain/git-credential-osxkeychain.o: contrib/credential/osxkeychain/git-credential-osxkeychain.c GIT-CFLAGS
     -+	@mkdir -p contrib/credential/osxkeychain/.depend
      +	$(QUIET_LINK)$(CC) -o $@ -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
      +
      +install-git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain

 Makefile                                | 21 ++++++++
 contrib/credential/osxkeychain/Makefile | 65 +++----------------------
 2 files changed, 27 insertions(+), 59 deletions(-)