kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'lt/diffgen' into next 

* lt/diffgen:
  add clean and ignore rules for xdiff/
  Remove dependency on a file named "-lz"
maint
Junio C Hamano 2006-03-26 23:44:28 -08:00
parent d93067d9c7 3467fec516
commit ac93bfc3b6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -128,8 +128,7 @@ common-cmds.h
*.deb *.deb
git-core.spec git-core.spec
*.exe *.exe
libgit.a *.[ao]
*.o
*.py[co] *.py[co]
config.mak config.mak
git-blame git-blame

9
Makefile
View File

@ -210,8 +210,8 @@ LIB_OBJS = \
fetch-clone.o revision.o pager.o \ fetch-clone.o revision.o pager.o \
$(DIFF_OBJS) $(DIFF_OBJS)


LIBS = $(LIB_FILE) $(XDIFF_LIB) GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
LIBS += -lz LIBS = $(GITLIBS) -lz


# #
# Platform specific tweaks # Platform specific tweaks
@ -545,7 +545,7 @@ init-db.o: init-db.c
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c


$(LIB_OBJS): $(LIB_H) $(LIB_OBJS): $(LIB_H)
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIBS) $(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
$(DIFF_OBJS): diffcore.h $(DIFF_OBJS): diffcore.h


$(LIB_FILE): $(LIB_OBJS) $(LIB_FILE): $(LIB_OBJS)
@ -629,7 +629,8 @@ rpm: dist
### Cleaning rules ### Cleaning rules


clean: clean:
rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE) rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
$(LIB_FILE) $(XDIFF_LIB)
rm -f $(ALL_PROGRAMS) git$X rm -f $(ALL_PROGRAMS) git$X
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
rm -rf $(GIT_TARNAME) rm -rf $(GIT_TARNAME)