projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
built-in diff: minimum tweaks
[git.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
8d45378
..
0f565eb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-188,6
+188,7
@@
PYMODULES = \
gitMergeCommon.py
LIB_FILE=libgit.a
gitMergeCommon.py
LIB_FILE=libgit.a
+XDIFF_LIB=xdiff/lib.a
LIB_H = \
blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
LIB_H = \
blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
@@
-209,7
+210,7
@@
LIB_OBJS = \
fetch-clone.o revision.o pager.o \
$(DIFF_OBJS)
fetch-clone.o revision.o pager.o \
$(DIFF_OBJS)
-LIBS = $(LIB_FILE)
+LIBS = $(LIB_FILE)
$(XDIFF_LIB)
LIBS += -lz
#
LIBS += -lz
#
@@
-544,12
+545,18
@@
init-db.o: init-db.c
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c
$(LIB_OBJS): $(LIB_H)
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c
$(LIB_OBJS): $(LIB_H)
-$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB
_H
)
+$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB
S
)
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
$(AR) rcs $@ $(LIB_OBJS)
$(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
doc:
$(MAKE) -C Documentation all