This code is only useful for cherry-pick and revert built-ins, nothing else, so let's make it a builtin object, but make sure 'git-sequencer' is not generated. Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx> --- Makefile | 9 ++++++--- sequencer.c => builtin/sequencer.c | 0 sequencer.h => builtin/sequencer.h | 0 3 files changed, 6 insertions(+), 3 deletions(-) rename sequencer.c => builtin/sequencer.c (100%) rename sequencer.h => builtin/sequencer.h (100%) diff --git a/Makefile b/Makefile index 03524d0..d28bf7f 100644 --- a/Makefile +++ b/Makefile @@ -583,7 +583,8 @@ TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X)) # List built-in command $C whose implementation cmd_$C() is not in # builtin/$C.o but is linked in as part of some other command. -BUILT_INS += $(patsubst builtin/%.o,git-%$X,$(BUILTIN_OBJS)) +BUILT_INS_OBJS = $(filter-out $(BUILTIN_HELPER_OBJS),$(BUILTIN_OBJS)) +BUILT_INS += $(patsubst builtin/%.o,git-%$X,$(BUILT_INS_OBJS)) BUILT_INS += git-cherry$X BUILT_INS += git-cherry-pick$X @@ -714,7 +715,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 @@ -856,7 +856,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 @@ -894,6 +893,8 @@ LIB_OBJS += wt-status.o LIB_OBJS += xdiff-interface.o LIB_OBJS += zlib.o +BUILTIN_HELPER_OBJS += builtin/sequencer.o + BUILTIN_OBJS += builtin/add.o BUILTIN_OBJS += builtin/annotate.o BUILTIN_OBJS += builtin/apply.o @@ -990,6 +991,8 @@ BUILTIN_OBJS += builtin/verify-pack.o BUILTIN_OBJS += builtin/verify-tag.o BUILTIN_OBJS += builtin/write-tree.o +BUILTIN_OBJS += $(BUILTIN_HELPER_OBJS) + GITLIBS = $(LIB_FILE) $(XDIFF_LIB) EXTLIBS = 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