diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-25 17:44:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-25 17:44:01 -0800 |
| commit | 9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3 (patch) | |
| tree | 5fd3aab2074522c1218848ec7b64a0bf59ed4196 /Makefile | |
| parent | 48d6e97afe4dcce3bb01922b768cc4d831923e7f (diff) | |
| parent | 3ce8f08944e614813c7dfb212a88b7c4e3b443bc (diff) | |
| download | git-9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3.tar.gz git-9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3.tar.xz | |
Merge branch 'lt/diffgen' into next
* lt/diffgen:
built-in diff: minimum tweaks
builtin-diff: \No newline at end of file.
Use a *real* built-in diff generator
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -188,6 +188,7 @@ PYMODULES = \ gitMergeCommon.py LIB_FILE=libgit.a +XDIFF_LIB=xdiff/lib.a LIB_H = \ blob.h cache.h commit.h csum-file.h delta.h \ @@ -209,7 +210,7 @@ LIB_OBJS = \ fetch-clone.o revision.o pager.o \ $(DIFF_OBJS) -LIBS = $(LIB_FILE) +LIBS = $(LIB_FILE) $(XDIFF_LIB) LIBS += -lz # @@ -544,12 +545,18 @@ init-db.o: init-db.c -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c $(LIB_OBJS): $(LIB_H) -$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) +$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIBS) $(DIFF_OBJS): diffcore.h $(LIB_FILE): $(LIB_OBJS) $(AR) rcs $@ $(LIB_OBJS) +XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o + +$(XDIFF_LIB): $(XDIFF_OBJS) + $(AR) rcs $@ $(XDIFF_OBJS) + + doc: $(MAKE) -C Documentation all |