diff --git a/mozilla/modules/libimg/pngcom/makefile.win b/mozilla/modules/libimg/pngcom/makefile.win index 5fb800aa001..8ee0bc67c55 100644 --- a/mozilla/modules/libimg/pngcom/makefile.win +++ b/mozilla/modules/libimg/pngcom/makefile.win @@ -49,7 +49,7 @@ LLIBS= $(LIBNSPR) \ $(DIST)\lib\png.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\raptorbase.lib \ - $(DIST)\lib\zip3250.lib \ + $(DIST)\lib\zlib.lib \ !ifdef NU_CACHE $(DIST)\lib\cache.lib \ !endif diff --git a/mozilla/modules/zlib/src/makefile.win b/mozilla/modules/zlib/src/makefile.win index 7b76dd6daca..712ec1f5154 100644 --- a/mozilla/modules/zlib/src/makefile.win +++ b/mozilla/modules/zlib/src/makefile.win @@ -44,8 +44,8 @@ MAKE_OBJ_TYPE=DLL #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=zip$(MOZ_BITS)$(VERSION_NUMBER) -MAPFILE=$(MOD_ZIP).map +DLLNAME=$(MODULE) +MAPFILE= $(DLLNAME).map #//------------------------------------------------------------------------ #// @@ -77,8 +77,6 @@ OBJS= \ #//------------------------------------------------------------------------ DLL=.\$(OBJDIR)\$(DLLNAME).dll -MAPFILE= $(MOD_ZIP).map - #//------------------------------------------------------------------------ #// @@ -106,4 +104,6 @@ export:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib - +clobber:: + $(RM) $(DIST)\bin\$(DLLNAME).dll + $(RM) $(DIST)\lib\$(DLLNAME).lib diff --git a/mozilla/network/module/makefile.win b/mozilla/network/module/makefile.win index c1bddd9924f..aa44128daf9 100644 --- a/mozilla/network/module/makefile.win +++ b/mozilla/network/module/makefile.win @@ -119,7 +119,7 @@ LLIBS=$(LLIBS) $(LIBNSPR) \ $(DIST)\lib\xppref32.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xplib.lib \ - $(DIST)\lib\zip3250.lib \ + $(DIST)\lib\zlib.lib \ $(DIST)\lib\raptorbase.lib \ $(DIST)\lib\dbm32.lib \ $(NETLIBS) \