From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sun, 26 Mar 2006 23:14:52 +0000 (+0200)
Subject: Remove dependency on a file named "-lz"
X-Git-Tag: v1.3.0-rc1~2^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;ds=sidebyside;h=54c261f90fb8aa9a0f12431cce2c2631a119d667;p=git.git

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 <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index 0f565eb4..f5e2fc8c 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)