Re: [PATCH 2/3] make: delete XDIFF_LIB, add xdiff to LIB_OBJS

From: Ezekiel Newren <ezekielnewren@gmail.com>
Date: Oct 2, 2025, 18:53 UTC
Message-ID: <CAH=ZcbDJWYzgMt_fK5z_07VhBFgKW=Q7stZBLhZJZTz+Ez2-FQ@mail.gmail.com>
In-Reply-To: <aN4R51_j2ieF-sjy@pks.im>

On Wed, Oct 1, 2025 at 11:47 PM Patrick Steinhardt <ps@pks.im> wrote:

Show 17 quoted lines

>
> On Wed, Oct 01, 2025 at 06:02:27PM +0000, Ezekiel Newren via GitGitGadget wrote:
> > diff --git a/Makefile b/Makefile
> > index e8fad803be..d89ba03286 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1397,8 +1396,7 @@ XDIFF_OBJS += xdiff/xmerge.o
> >  XDIFF_OBJS += xdiff/xpatience.o
> >  XDIFF_OBJS += xdiff/xprepare.o
> >  XDIFF_OBJS += xdiff/xutils.o
> > -.PHONY: xdiff-objs
> > -xdiff-objs: $(XDIFF_OBJS)
>
> The removal of the `xdiff-objs` target isn't mentioned or justified in
> the commit message. I personally don't mind that this target goes away,
> as I don't really have a use case for it anyway. But in theory it could
> continue to exist. So I'd either retain it, or explain why it goes away.

If I understand correctly, the PHONY target xdiff-objs is to make sure that xdiff/lib.a is always built. But if it's folded into libgit.a then its purpose becomes moot. I will update my commit message to make this clear.