averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

make: delete REFTABLE_LIB, add reftable to LIB_OBJS

Browse Source 
Same idea as the previous commit except that I don't know when or if
reftable will be turned into a Rust crate.

Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ezekiel Newren
2025-10-02 23:27:27 +00:00
committed by Junio C Hamano
parent cf680cdb95
commit f3b4c89d59
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Makefile
View File

@@ -916,7 +916,6 @@ export PYTHON_PATH
TEST_SHELL_PATH = $(SHELL_PATH) TEST_SHELL_PATH = $(SHELL_PATH)
LIB_FILE = libgit.a LIB_FILE = libgit.a
REFTABLE_LIB = reftable/libreftable.a
GENERATED_H += command-list.h GENERATED_H += command-list.h
GENERATED_H += config-list.h GENERATED_H += config-list.h
@@ -1134,6 +1133,19 @@ LIB_OBJS += refs/iterator.o
LIB_OBJS += refs/packed-backend.o LIB_OBJS += refs/packed-backend.o
LIB_OBJS += refs/ref-cache.o LIB_OBJS += refs/ref-cache.o
LIB_OBJS += refspec.o LIB_OBJS += refspec.o
LIB_OBJS += reftable/basics.o
LIB_OBJS += reftable/error.o
LIB_OBJS += reftable/block.o
LIB_OBJS += reftable/blocksource.o
LIB_OBJS += reftable/iter.o
LIB_OBJS += reftable/merged.o
LIB_OBJS += reftable/pq.o
LIB_OBJS += reftable/record.o
LIB_OBJS += reftable/stack.o
LIB_OBJS += reftable/system.o
LIB_OBJS += reftable/table.o
LIB_OBJS += reftable/tree.o
LIB_OBJS += reftable/writer.o
LIB_OBJS += remote.o LIB_OBJS += remote.o
LIB_OBJS += replace-object.o LIB_OBJS += replace-object.o
LIB_OBJS += repo-settings.o LIB_OBJS += repo-settings.o
@@ -1394,8 +1406,7 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o
UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
# reftable lib may in turn depend on what is in libgit.a GITLIBS = common-main.o $(LIB_FILE)
GITLIBS = common-main.o $(LIB_FILE) $(REFTABLE_LIB) $(LIB_FILE)
EXTLIBS = EXTLIBS =
GIT_USER_AGENT = git/$(GIT_VERSION) GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -2727,20 +2738,6 @@ reconfigure config.mak.autogen: config.status
.PHONY: reconfigure # This is a convenience target. .PHONY: reconfigure # This is a convenience target.
endif endif
REFTABLE_OBJS += reftable/basics.o
REFTABLE_OBJS += reftable/error.o
REFTABLE_OBJS += reftable/block.o
REFTABLE_OBJS += reftable/blocksource.o
REFTABLE_OBJS += reftable/iter.o
REFTABLE_OBJS += reftable/merged.o
REFTABLE_OBJS += reftable/pq.o
REFTABLE_OBJS += reftable/record.o
REFTABLE_OBJS += reftable/stack.o
REFTABLE_OBJS += reftable/system.o
REFTABLE_OBJS += reftable/table.o
REFTABLE_OBJS += reftable/tree.o
REFTABLE_OBJS += reftable/writer.o
TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS)) TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
.PHONY: test-objs .PHONY: test-objs
@@ -2762,7 +2759,7 @@ OBJECTS += $(SCALAR_OBJS)
OBJECTS += $(PROGRAM_OBJS) OBJECTS += $(PROGRAM_OBJS)
OBJECTS += $(TEST_OBJS) OBJECTS += $(TEST_OBJS)
OBJECTS += $(FUZZ_OBJS) OBJECTS += $(FUZZ_OBJS)
OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS) OBJECTS += $(REFTABLE_TEST_OBJS)
OBJECTS += $(UNIT_TEST_OBJS) OBJECTS += $(UNIT_TEST_OBJS)
OBJECTS += $(CLAR_TEST_OBJS) OBJECTS += $(CLAR_TEST_OBJS)
OBJECTS += $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS)) OBJECTS += $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS))
@@ -2914,9 +2911,6 @@ scalar$X: scalar.o GIT-LDFLAGS $(GITLIBS)
$(LIB_FILE): $(LIB_OBJS) $(LIB_FILE): $(LIB_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
$(REFTABLE_LIB): $(REFTABLE_OBJS)
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
export DEFAULT_EDITOR DEFAULT_PAGER export DEFAULT_EDITOR DEFAULT_PAGER
Documentation/GIT-EXCLUDED-PROGRAMS: FORCE Documentation/GIT-EXCLUDED-PROGRAMS: FORCE
@@ -3755,7 +3749,7 @@ clean: profile-clean coverage-clean cocciclean
$(RM) git.rc git.res $(RM) git.rc git.res
$(RM) $(OBJECTS) $(RM) $(OBJECTS)
$(RM) headless-git.o $(RM) headless-git.o
$(RM) $(LIB_FILE) $(REFTABLE_LIB) $(RM) $(LIB_FILE)
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS)
$(RM) $(TEST_PROGRAMS) $(RM) $(TEST_PROGRAMS)
$(RM) $(FUZZ_PROGRAMS) $(RM) $(FUZZ_PROGRAMS)
@@ -3948,7 +3942,6 @@ endif
LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o
LIBGIT_PUB_OBJS += libgit.a LIBGIT_PUB_OBJS += libgit.a
LIBGIT_PUB_OBJS += reftable/libreftable.a
LIBGIT_PARTIAL_EXPORT = contrib/libgit-sys/partial_symbol_export.o LIBGIT_PARTIAL_EXPORT = contrib/libgit-sys/partial_symbol_export.o