Re: [PATCH] wincred: align Makefile with other Makefiles in contrib

From: Thomas Uhle <thomas.uhle@mailbox.tu-dresden.de>
Date: Nov 7, 2025, 11:45 UTC
Message-ID: <19573251-81e1-e07d-0f21-1f90ea5153a3@mailbox.tu-dresden.de>
In-Reply-To: <xmqqv7jnhzmh.fsf@gitster.g>

On Thu, 6 Nov 2025, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
>> Hallo Thomas, wie geht's? Grüße an den Biergarten am Blauen Wunder!

Ich komme am Schillergarten so bald leider nicht vorbei, es ist einfach zu ungemütlich draußen, und Glühwein gibt es vermutlich auch noch nicht. ;)

Show 21 quoted lines

>> On Wed, 5 Nov 2025, Thomas Uhle wrote:
>>
>>> * Replace $(LOADLIBES) because it is deprecated since long and it is
>>>   used nowhere else in the git project.
>>> * Use $(gitexecdir) instead of $(libexecdir) because config.mak defines
>>>   $(libexecdir) as $(prefix)/libexec, not as $(prefix)/libexec/git-core.
>>> * Similar to other Makefiles, let install target rule create
>>>   $(gitexecdir) to make sure the directory exists before copying the
>>>   executable and also let it respect $(DESTDIR).
>>> * Shuffle the lines for the default settings to align them with the
>>>   other Makefiles in contrib/credential.
>>> * Define .PHONY for all special targets (all, install, clean).
>>
>> These changes all make sense to me. Feel free to add
>>
>> 	Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>>
>> Thank you,
>> Johannes
>
> Thanks, both.  Will queue with your Ack.

Thank you! Does this patch qualify for the final version 2.52.0 or is it already too late? And if it is the latter, wouldn't it make sense to have it in an updated version 2.52.1?

Best regards,

Thomas

Show 46 quoted lines

>>>
>>> Signed-off-by: Thomas Uhle <thomas.uhle@mailbox.tu-dresden.de>
>>> ---
>>>  contrib/credential/wincred/Makefile | 18 ++++++++++--------
>>>  1 file changed, 10 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/contrib/credential/wincred/Makefile b/contrib/credential/wincred/Makefile
>>> index 5b795fc..d92e721 100644
>>> --- a/contrib/credential/wincred/Makefile
>>> +++ b/contrib/credential/wincred/Makefile
>>> @@ -4,20 +4,22 @@
>>>  -include ../../../config.mak.autogen
>>>  -include ../../../config.mak
>>>
>>> -CC ?= gcc
>>> -RM ?= rm -f
>>> -CFLAGS ?= -O2 -Wall
>>> -
>>>  prefix ?= /usr/local
>>> -libexecdir ?= $(prefix)/libexec/git-core
>>> +gitexecdir ?= $(prefix)/libexec/git-core
>>>
>>> +CC ?= gcc
>>> +CFLAGS ?= -O2 -Wall
>>>  INSTALL ?= install
>>> +RM ?= rm -f
>>>
>>> -git-credential-wincred.exe : git-credential-wincred.c
>>> -	$(LINK.c) $^ $(LOADLIBES) $(LDLIBS) -o $@
>>> +git-credential-wincred.exe: git-credential-wincred.c
>>> +	$(LINK.c) -o $@ $^ $(LDFLAGS) $(LDLIBS)
>>>
>>>  install: git-credential-wincred.exe
>>> -	$(INSTALL) -m 755 $^ $(libexecdir)
>>> +	$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
>>> +	$(INSTALL) -m 755 $< $(DESTDIR)$(gitexecdir)
>>>
>>>  clean:
>>>  	$(RM) git-credential-wincred.exe
>>> +
>>> +.PHONY: all install clean
>>>
>>> base-commit: 4cf919bd7b946477798af5414a371b23fd68bf93
>>> --
>>> 2.47.3
>>>