From bdaa4b6aca2ddf2512441cc560dc5142a06dbf03 Mon Sep 17 00:00:00 2001 From: "bent.mozilla%gmail.com" Date: Thu, 6 Apr 2006 16:51:10 +0000 Subject: [PATCH] Bug 321650 - "error in bsdiff makefile results in compile error of mbsdiff". Adds bsdiff makefiles to allmakefiles.sh (uses the --enable-update-packaging mozconfig option), adds RTL_FLAGS to HOST_CFLAGS globally, and uses HOST_EXTRA_LIBS instead of EXTRA_LIBS in the bsdiff makefile. r=bsmedberg. --- allmakefiles.sh | 5 ++++- config/config.mk | 1 + other-licenses/bsdiff/Makefile.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/allmakefiles.sh b/allmakefiles.sh index b012fd24139..a13b25c4536 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -1219,7 +1219,10 @@ MAKEFILES_libmar=" " if test -n "$MOZ_UPDATE_PACKAGING"; then - MAKEFILES_update_packaging="tools/update-packaging/Makefile" + MAKEFILES_update_packaging=" + tools/update-packaging/Makefile + other-licenses/bsdiff/Makefile + " fi if [ ! "$SYSTEM_PNG" ]; then diff --git a/config/config.mk b/config/config.mk index 6fcc24edcbc..fbe6ce8f15e 100644 --- a/config/config.mk +++ b/config/config.mk @@ -600,6 +600,7 @@ endif # WINNT && !GNU_CC COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS) COMPILE_CXXFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) $(PROFILER_CFLAGS) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS) +HOST_CFLAGS += $(RTL_FLAGS) # # Name of the binary code directories diff --git a/other-licenses/bsdiff/Makefile.in b/other-licenses/bsdiff/Makefile.in index a0ec90f6acb..f1f8cf0b768 100644 --- a/other-licenses/bsdiff/Makefile.in +++ b/other-licenses/bsdiff/Makefile.in @@ -50,7 +50,7 @@ HOST_CSRCS = bsdiff.c HOST_LIBS += $(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) ifeq (WINNT,$(OS_ARCH)) -EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32) +HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME,Ws2_32) endif LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/mozapps/update/src/updater