From 54c261f90fb8aa9a0f12431cce2c2631a119d667 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 27 Mar 2006 01:14:52 +0200 Subject: [PATCH 1/2] Remove dependency on a file named "-lz" By changing the dependency "$(LIB_H)" to "$(LIBS)", at least one version of make thought that a file named "-lz" would be needed. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0f565eb4d3..f5e2fc8ceb 100644 --- a/Makefile +++ b/Makefile @@ -210,8 +210,8 @@ LIB_OBJS = \ 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 @@ -545,7 +545,7 @@ init-db.o: init-db.c -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) From 3467fec516e0549cfe7ae3ed8bd981a7e5f528f4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 26 Mar 2006 23:41:22 -0800 Subject: [PATCH 2/2] add clean and ignore rules for xdiff/ Signed-off-by: Junio C Hamano --- .gitignore | 3 +-- Makefile | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b4355b9faf..75891c393b 100644 --- a/.gitignore +++ b/.gitignore @@ -128,8 +128,7 @@ common-cmds.h *.deb git-core.spec *.exe -libgit.a -*.o +*.[ao] *.py[co] config.mak git-blame diff --git a/Makefile b/Makefile index f5e2fc8ceb..02d290d334 100644 --- a/Makefile +++ b/Makefile @@ -629,7 +629,8 @@ rpm: dist ### 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)