Andrew's git / gitweb.git / diff
?
Remove dependency on a file named "-lz"
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sun, 26 Mar 2006 23:14:52 +0000 (01:14 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 27 Mar 2006 03:07:08 +0000 (19:07 -0800)
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>
Makefile patch | blob | history
diff --git a/Makefile b/Makefile
index 0f565eb4d3c488e5a8b5c64c053821b78989f6c8..f5e2fc8ceb675fab63ab91f20d518e074b57a187 100644 (file)
--- 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)