author | Junio C Hamano <junkio@cox.net> | |
Mon, 27 Mar 2006 07:44:28 +0000 (23:44 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Mon, 27 Mar 2006 07:44:28 +0000 (23:44 -0800) |
* lt/diffgen:
add clean and ignore rules for xdiff/
Remove dependency on a file named "-lz"
add clean and ignore rules for xdiff/
Remove dependency on a file named "-lz"
.gitignore | patch | blob | history | |
Makefile | patch | blob | history |
diff --git a/.gitignore b/.gitignore
index b4355b9faf598ff23243954b6b1aaa5cc3a6e832..75891c393bb224684072014531fb1d4aecbe8ca4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
*.deb
git-core.spec
*.exe
-libgit.a
-*.o
+*.[ao]
*.py[co]
config.mak
git-blame
diff --git a/Makefile b/Makefile
index 663a803dd8e0d017fd447108abd670e8ed3c64dc..4edb3833212387f4a684cd6dc8ec99c5246a6e72 100644 (file)
--- a/Makefile
+++ b/Makefile
fetch-clone.o revision.o pager.o \
$(DIFF_OBJS)
-LIBS = $(LIB_FILE) $(XDIFF_LIB)
-LIBS += -lz
+GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
+LIBS = $(GITLIBS) -lz
#
# Platform specific tweaks
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c
$(LIB_OBJS): $(LIB_H)
-$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIBS)
+$(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
### Cleaning rules
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 *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
rm -rf $(GIT_TARNAME)