зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
cebff98dbe
Коммит
54c261f90f
6
Makefile
6
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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче