make: delete REFTABLE_LIB, add reftable to LIB_OBJS
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>
Ezekiel Newren committed
Oct 2, 2025 at 23:27 UTC
f3b4c89d59f15f3b67f29bff6f1f53dbc11a5b58
1 file changed
+16
-23
Makefile
+16
-23
@@ -916,7 +916,6 @@ export PYTHON_PATH
916
TEST_SHELL_PATH = $(SHELL_PATH)
917
918
LIB_FILE = libgit.a
919
-REFTABLE_LIB = reftable/libreftable.a
919
920
GENERATED_H += command-list.h
921
GENERATED_H += config-list.h
@@ -1134,6 +1133,19 @@ LIB_OBJS += refs/iterator.o
1133
LIB_OBJS += refs/packed-backend.o
1134
LIB_OBJS += refs/ref-cache.o
1135
LIB_OBJS += refspec.o
1136
+LIB_OBJS += reftable/basics.o
1137
+LIB_OBJS += reftable/error.o
1138
+LIB_OBJS += reftable/block.o
1139
+LIB_OBJS += reftable/blocksource.o
1140
+LIB_OBJS += reftable/iter.o
1141
+LIB_OBJS += reftable/merged.o
1142
+LIB_OBJS += reftable/pq.o
1143
+LIB_OBJS += reftable/record.o
1144
+LIB_OBJS += reftable/stack.o
1145
+LIB_OBJS += reftable/system.o
1146
+LIB_OBJS += reftable/table.o
1147
+LIB_OBJS += reftable/tree.o
1148
+LIB_OBJS += reftable/writer.o
1149
LIB_OBJS += remote.o
1150
LIB_OBJS += replace-object.o
1151
LIB_OBJS += repo-settings.o
@@ -1394,8 +1406,7 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o
1406
1407
UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o
1408
1397
-# reftable lib may in turn depend on what is in libgit.a
1398
-GITLIBS = common-main.o $(LIB_FILE) $(REFTABLE_LIB) $(LIB_FILE)
1409
+GITLIBS = common-main.o $(LIB_FILE)
1410
EXTLIBS =
1411
1412
GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -2727,20 +2738,6 @@ reconfigure config.mak.autogen: config.status
2738
.PHONY: reconfigure # This is a convenience target.
2739
endif
2740
2730
-REFTABLE_OBJS += reftable/basics.o
2731
-REFTABLE_OBJS += reftable/error.o
2732
-REFTABLE_OBJS += reftable/block.o
2733
-REFTABLE_OBJS += reftable/blocksource.o
2734
-REFTABLE_OBJS += reftable/iter.o
2735
-REFTABLE_OBJS += reftable/merged.o
2736
-REFTABLE_OBJS += reftable/pq.o
2737
-REFTABLE_OBJS += reftable/record.o
2738
-REFTABLE_OBJS += reftable/stack.o
2739
-REFTABLE_OBJS += reftable/system.o
2740
-REFTABLE_OBJS += reftable/table.o
2741
-REFTABLE_OBJS += reftable/tree.o
2742
-REFTABLE_OBJS += reftable/writer.o
2743
-
2741
TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
2742
2743
.PHONY: test-objs
@@ -2762,7 +2759,7 @@ OBJECTS += $(SCALAR_OBJS)
2759
OBJECTS += $(PROGRAM_OBJS)
2760
OBJECTS += $(TEST_OBJS)
2761
OBJECTS += $(FUZZ_OBJS)
2765
-OBJECTS += $(REFTABLE_OBJS) $(REFTABLE_TEST_OBJS)
2762
+OBJECTS += $(REFTABLE_TEST_OBJS)
2763
OBJECTS += $(UNIT_TEST_OBJS)
2764
OBJECTS += $(CLAR_TEST_OBJS)
2765
OBJECTS += $(patsubst %,$(UNIT_TEST_DIR)/%.o,$(UNIT_TEST_PROGRAMS))
@@ -2914,9 +2911,6 @@ scalar$X: scalar.o GIT-LDFLAGS $(GITLIBS)
2911
$(LIB_FILE): $(LIB_OBJS)
2912
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
2913
2917
-$(REFTABLE_LIB): $(REFTABLE_OBJS)
2918
- $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
2919
-
2914
export DEFAULT_EDITOR DEFAULT_PAGER
2915
2916
Documentation/GIT-EXCLUDED-PROGRAMS: FORCE
@@ -3755,7 +3749,7 @@ clean: profile-clean coverage-clean cocciclean
3749
$(RM) git.rc git.res
3750
$(RM) $(OBJECTS)
3751
$(RM) headless-git.o
3758
- $(RM) $(LIB_FILE) $(REFTABLE_LIB)
3752
+ $(RM) $(LIB_FILE)
3753
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS)
3754
$(RM) $(TEST_PROGRAMS)
3755
$(RM) $(FUZZ_PROGRAMS)
@@ -3948,7 +3942,6 @@ endif
3942
3943
LIBGIT_PUB_OBJS += contrib/libgit-sys/public_symbol_export.o
3944
LIBGIT_PUB_OBJS += libgit.a
3951
-LIBGIT_PUB_OBJS += reftable/libreftable.a
3945
3946
LIBGIT_PARTIAL_EXPORT = contrib/libgit-sys/partial_symbol_export.o
3947