This code is only useful for cherry-pick and revert built-ins, nothing else, so let's make it a builtin object. The first source file that doesn't generate a git-foo builtin, but does go into the builtin library. Hopefully the first of many to clean libgit.a. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- Makefile | 10 ++++++---- sequencer.c => builtin/sequencer.c | 0 sequencer.h => builtin/sequencer.h | 0 3 files changed, 6 insertions(+), 4 deletions(-) rename sequencer.c => builtin/sequencer.c (100%) rename sequencer.h => builtin/sequencer.h (100%) diff --git a/Makefile b/Makefile index d2af207..4c7bb88 100644 --- a/Makefile +++ b/Makefile @@ -716,7 +716,6 @@ LIB_H += resolve-undo.h LIB_H += revision.h LIB_H += run-command.h LIB_H += send-pack.h -LIB_H += sequencer.h LIB_H += sha1-array.h LIB_H += sha1-lookup.h LIB_H += shortlog.h @@ -858,7 +857,6 @@ LIB_OBJS += resolve-undo.o LIB_OBJS += revision.o LIB_OBJS += run-command.o LIB_OBJS += send-pack.o -LIB_OBJS += sequencer.o LIB_OBJS += server-info.o LIB_OBJS += setup.o LIB_OBJS += sha1-array.o @@ -992,6 +990,9 @@ BUILTIN_OBJS += builtin/verify-pack.o BUILTIN_OBJS += builtin/verify-tag.o BUILTIN_OBJS += builtin/write-tree.o +BUILTIN_LIB_OBJS += builtin/sequencer.o +BUILTIN_LIB_OBJS += $(BUILTIN_OBJS) + GITLIBS = $(LIB_FILE) $(XDIFF_LIB) EXTLIBS = @@ -1894,7 +1895,8 @@ VCSSVN_OBJS += vcs-svn/svndiff.o VCSSVN_OBJS += vcs-svn/svndump.o TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS)) -OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ +OBJECTS := $(LIB_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ + $(BUILTIN_LIB_OBJS) \ $(XDIFF_OBJS) \ $(VCSSVN_OBJS) \ git.o @@ -2071,7 +2073,7 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS $(LIB_FILE): $(LIB_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^ -$(BUILTIN_LIB): $(BUILTIN_OBJS) +$(BUILTIN_LIB): $(BUILTIN_LIB_OBJS) $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^ $(XDIFF_LIB): $(XDIFF_OBJS) diff --git a/sequencer.c b/builtin/sequencer.c similarity index 100% rename from sequencer.c rename to builtin/sequencer.c diff --git a/sequencer.h b/builtin/sequencer.h similarity index 100% rename from sequencer.h rename to builtin/sequencer.h -- 1.8.3.698.g079b096 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html