summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-03-26 23:14:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-27 03:07:08 (GMT)
commit54c261f90fb8aa9a0f12431cce2c2631a119d667 (patch)
tree8994ef3dde8ff540cf625003b7059c2186d292eb
parentcebff98dbe3fd6177337ae4d440b81ffed797608 (diff)
downloadgit-54c261f90fb8aa9a0f12431cce2c2631a119d667.zip
git-54c261f90fb8aa9a0f12431cce2c2631a119d667.tar.gz
git-54c261f90fb8aa9a0f12431cce2c2631a119d667.tar.bz2
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>
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0f565eb..f5e2fc8 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)