From: Junio C Hamano Date: Fri, 21 Apr 2006 20:32:58 +0000 (-0700) Subject: Merge branch 'jc/fmt-patch' into next X-Git-Tag: v1.4.1-rc1~194 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6082c4433be3d0390eca56897bd0907407dc55eb?hp=-c Merge branch 'jc/fmt-patch' into next * jc/fmt-patch: Split up builtin commands into separate files from git.c git-log produces no output --- 6082c4433be3d0390eca56897bd0907407dc55eb diff --combined Makefile index 9cbb90b95d,a83c5029f4..ab021eddbd --- a/Makefile +++ b/Makefile @@@ -213,6 -213,9 +213,9 @@@ LIB_OBJS = fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \ $(DIFF_OBJS) + BUILTIN_OBJS = \ + builtin-log.o builtin-help.o + GITLIBS = $(LIB_FILE) $(XDIFF_LIB) LIBS = $(GITLIBS) -lz @@@ -462,10 -465,10 +465,10 @@@ all strip: $(PROGRAMS) git$X $(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X - git$X: git.c common-cmds.h $(GITLIBS) + git$X: git.c common-cmds.h $(BUILTIN_OBJS) $(GITLIBS) $(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \ $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \ - $(ALL_LDFLAGS) $(LIBS) + $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS) $(BUILT_INS): git$X rm -f $@ && ln git$X $@ @@@ -565,7 -568,7 +568,7 @@@ init-db.o: init-db. $(CC) -c $(ALL_CFLAGS) \ -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c - $(LIB_OBJS): $(LIB_H) + $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H) $(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS) $(DIFF_OBJS): diffcore.h @@@ -606,9 -609,6 +609,9 @@@ test-date$X: test-date.c date.o ctype. test-delta$X: test-delta.c diff-delta.o patch-delta.o $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ -lz +test-gsimm$X: test-gsimm.c gsimm.o rabinpoly.o + $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^ + check: for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done @@@ -657,7 -657,6 +660,7 @@@ clean rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \ $(LIB_FILE) $(XDIFF_LIB) rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X + rm -f test-date$X test-delta$X test-gsimm$X rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags rm -rf $(GIT_TARNAME) rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz