Bug 372593 - Metrics (and mbsdiff) don't link because they can't find libbz2, r=luser

git-svn-id: svn://10.0.0.236/trunk@221517 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us 2007-03-08 02:18:22 +00:00
parent db66042f7f
commit f466cf8c5f
3 changed files with 3 additions and 3 deletions

View File

@ -61,7 +61,7 @@ CPPSRCS = \
SHARED_LIBRARY_LIBS = \ SHARED_LIBRARY_LIBS = \
../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \ ../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ $(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
$(NULL) $(NULL)
EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \ EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \

View File

@ -67,7 +67,7 @@ LOCAL_INCLUDES = \
LIBS = \ LIBS = \
../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \ ../src/$(LIB_PREFIX)metrics_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \ $(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
$(XPCOM_GLUE_LDOPTS) \ $(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NULL) $(NULL)

View File

@ -47,7 +47,7 @@ include $(DEPTH)/config/autoconf.mk
# build system and is not intended to be included in Mozilla distributions. # build system and is not intended to be included in Mozilla distributions.
HOST_PROGRAM = mbsdiff$(BIN_SUFFIX) HOST_PROGRAM = mbsdiff$(BIN_SUFFIX)
HOST_CSRCS = bsdiff.c HOST_CSRCS = bsdiff.c
HOST_LIBS += $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) HOST_LIBS += $(DEPTH)/modules/libbz2/src/$(LIB_PREFIX)bz2.$(LIB_SUFFIX)
ifeq (WINNT,$(OS_ARCH)) ifeq (WINNT,$(OS_ARCH))
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32) HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32)