[PATCH v2 1/2] make: delete XDIFF_LIB, add xdiff to LIB_OBJS

public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: "Ezekiel Newren via GitGitGadget" <gitgitgadget@gmail•com>
To: git@vger•kernel.org
Cc: Patrick Steinhardt <ps@pks•im>,
	Ezekiel Newren <ezekielnewren@gmail•com>,
	Ezekiel Newren <ezekielnewren@gmail•com>
Subject: [PATCH v2 1/2] make: delete XDIFF_LIB, add xdiff to LIB_OBJS
Date: Thu, 02 Oct 2025 23:27:26 +0000	[thread overview]
Message-ID: <b535a456ae7e02c518de2637381ee6c6efc7da48.1759447647.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2065.v2.git.git.1759447647.gitgitgadget@gmail.com>

From: Ezekiel Newren <ezekielnewren@gmail•com>

In a future patch series the 'xdiff' Rust crate will be added. Delete
the creation of the static library file for xdiff to avoid a name
conflict. This also moves toward the goal of Rust only needing to link
against libgit.a.

Changes to Meson are not required as the xdiff library is already
included in Meson's libgit.a.

xdiff-objs was a historical make target to allow building just the
objects in xdiff. Since it was defined in terms of XDIFF_OBJS (which
no longer exists) this convenience make target no longer makes sense.
Remove it.

Signed-off-by: Ezekiel Newren <ezekielnewren@gmail•com>
---
 Makefile | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 92fd8d86d8..d37edd3d03 100644
--- a/Makefile
+++ b/Makefile
@@ -918,7 +918,6 @@ export PYTHON_PATH
 TEST_SHELL_PATH = $(SHELL_PATH)
 
 LIB_FILE = libgit.a
-XDIFF_LIB = xdiff/lib.a
 REFTABLE_LIB = reftable/libreftable.a
 
 GENERATED_H += command-list.h
@@ -1209,6 +1208,13 @@ LIB_OBJS += write-or-die.o
 LIB_OBJS += ws.o
 LIB_OBJS += wt-status.o
 LIB_OBJS += xdiff-interface.o
+LIB_OBJS += xdiff/xdiffi.o
+LIB_OBJS += xdiff/xemit.o
+LIB_OBJS += xdiff/xhistogram.o
+LIB_OBJS += xdiff/xmerge.o
+LIB_OBJS += xdiff/xpatience.o
+LIB_OBJS += xdiff/xprepare.o
+LIB_OBJS += xdiff/xutils.o
 
 BUILTIN_OBJS += builtin/add.o
 BUILTIN_OBJS += builtin/am.o
@@ -1390,8 +1396,8 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o
 
 UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
 
-# xdiff and reftable libs may in turn depend on what is in libgit.a
-GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
+# reftable lib may in turn depend on what is in libgit.a
+GITLIBS = common-main.o $(LIB_FILE) $(REFTABLE_LIB) $(LIB_FILE)
 EXTLIBS =
 
 GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -2723,16 +2729,6 @@ 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
-.PHONY: xdiff-objs
-xdiff-objs: $(XDIFF_OBJS)
-
 REFTABLE_OBJS += reftable/basics.o
 REFTABLE_OBJS += reftable/error.o
 REFTABLE_OBJS += reftable/block.o
@@ -2767,7 +2763,6 @@ OBJECTS += $(GIT_OBJS)
 OBJECTS += $(SCALAR_OBJS)
 OBJECTS += $(PROGRAM_OBJS)
 OBJECTS += $(TEST_OBJS)
-OBJECTS += $(XDIFF_OBJS)
 OBJECTS += $(FUZZ_OBJS)
 OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS)
 OBJECTS += $(UNIT_TEST_OBJS)
@@ -2921,9 +2916,6 @@ scalar$X: scalar.o GIT-LDFLAGS $(GITLIBS)
 $(LIB_FILE): $(LIB_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
 
-$(XDIFF_LIB): $(XDIFF_OBJS)
-	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-
 $(REFTABLE_LIB): $(REFTABLE_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
 
@@ -3765,7 +3757,7 @@ clean: profile-clean coverage-clean cocciclean
 	$(RM) git.rc git.res
 	$(RM) $(OBJECTS)
 	$(RM) headless-git.o
-	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB)
+	$(RM) $(LIB_FILE) $(REFTABLE_LIB)
 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS)
 	$(RM) $(TEST_PROGRAMS)
 	$(RM) $(FUZZ_PROGRAMS)
@@ -3959,7 +3951,6 @@ endif
 LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o
 LIBGIT_PUB_OBJS += libgit.a
 LIBGIT_PUB_OBJS += reftable/libreftable.a
-LIBGIT_PUB_OBJS += xdiff/lib.a
 
 LIBGIT_PARTIAL_EXPORT = contrib/libgit-sys/partial_symbol_export.o
 
-- 
gitgitgadget

next prev parent reply	other threads:[~2025-10-02 23:27 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-01 18:02 [PATCH 0/3] Makefile update libgit.a: Include xdiff and reftable in libgit.a Ezekiel Newren via GitGitGadget
2025-10-01 18:02 ` [PATCH 1/3] make: move xdiff and reftable objects before GITLIBS Ezekiel Newren via GitGitGadget
2025-10-01 18:02 ` [PATCH 2/3] make: delete XDIFF_LIB, add xdiff to LIB_OBJS Ezekiel Newren via GitGitGadget
2025-10-02  5:47   ` Patrick Steinhardt
2025-10-02 13:31     ` Junio C Hamano
2025-10-02 15:33       ` Patrick Steinhardt
2025-10-02 18:50         ` Ezekiel Newren
2025-10-02 19:01           ` Junio C Hamano
2025-10-02 19:18             ` Ezekiel Newren
2025-10-02 18:53     ` Ezekiel Newren
2025-10-01 18:02 ` [PATCH 3/3] make: delete REFTABLE_LIB, add reftable " Ezekiel Newren via GitGitGadget
2025-10-02  5:49   ` Patrick Steinhardt
2025-10-02 13:32     ` Junio C Hamano
2025-10-02 18:57     ` Ezekiel Newren
2025-10-01 23:32 ` [PATCH 0/3] Makefile update libgit.a: Include xdiff and reftable in libgit.a Junio C Hamano
2025-10-02 19:17   ` Ezekiel Newren
2025-10-02 21:02   ` Junio C Hamano
2025-10-02 23:03     ` Ezekiel Newren
2025-10-02 23:27 ` [PATCH v2 0/2] " Ezekiel Newren via GitGitGadget
2025-10-02 23:27   ` Ezekiel Newren via GitGitGadget [this message]
2025-10-02 23:27   ` [PATCH v2 2/2] make: delete REFTABLE_LIB, add reftable to LIB_OBJS Ezekiel Newren via GitGitGadget
2025-10-03 16:43   ` [PATCH v2 0/2] Makefile update libgit.a: Include xdiff and reftable in libgit.a Junio C Hamano
2025-10-08  7:22     ` Patrick Steinhardt

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:92fd8d86d dfblob:d37edd3d0 )
 OR (
bs:"[PATCH v2 1/2] make: delete XDIFF_LIB, add xdiff to LIB_OBJS" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b535a456ae7e02c518de2637381ee6c6efc7da48.1759447647.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail$(echo .)com \
    --cc=ezekielnewren@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=ps@pks$(echo .)im \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox