diff --git a/modules/zlib/standalone/Makefile.in b/modules/zlib/standalone/Makefile.in deleted file mode 100644 index 407cfd03f14..00000000000 --- a/modules/zlib/standalone/Makefile.in +++ /dev/null @@ -1,77 +0,0 @@ -# -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.1 -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Original Code is mozilla.org code. -# -# The Initial Developer of the Original Code is -# Netscape Communications Corporation. -# Portions created by the Initial Developer are Copyright (C) 1998 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Samir Gehani -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 2 or later (the "GPL"), or -# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -# in which case the provisions of the GPL or the LGPL are applicable instead -# of those above. If you wish to allow use of your version of this file only -# under the terms of either the GPL or the LGPL, and not to allow others to -# use your version of this file under the terms of the MPL, indicate your -# decision by deleting the provisions above and replace them with the notice -# and other provisions required by the GPL or the LGPL. If you do not delete -# the provisions above, a recipient may use your version of this file under -# the terms of any one of the MPL, the GPL or the LGPL. -# -# ***** END LICENSE BLOCK ***** - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk -include $(srcdir)/../src/objs.mk - -MODULE = zlib -LIBRARY_NAME = mozz_s - -CSRCS = $(MODULES_ZLIB_SRC_LCSRCS) - -FORCE_STATIC_LIB = 1 -SRCS_IN_OBJDIR = 1 - -ifeq ($(OS_ARCH),WINNT) -USE_STATIC_LIBS=1 -endif - -ifeq ($(OS_ARCH),OS2) -USE_STATIC_LIBS=1 -endif - -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS) - -GARBAGE += $(MODULES_ZLIB_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX)) - -ifeq ($(OS_ARCH),WINNT) -GARBAGE += $(addprefix $(srcdir)/,$(MODULES_ZLIB_SRC_LCSRCS)) -endif - -include $(topsrcdir)/config/rules.mk - -LOCAL_INCLUDES = -I$(srcdir)/../src - -export:: $(MODULES_ZLIB_SRC_CSRCS) - $(INSTALL) $^ . - diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index 50423e00576..a41728e8ba7 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -714,10 +714,6 @@ MAKEFILES_accessible=" accessible/build/Makefile " -MAKEFILES_zlib=" - modules/zlib/standalone/Makefile -" - MAKEFILES_libmar=" modules/libmar/Makefile modules/libmar/src/Makefile @@ -775,7 +771,6 @@ add_makefiles " $MAKEFILES_xulapp $MAKEFILES_libpr0n $MAKEFILES_accessible - $MAKEFILES_zlib $MAKEFILES_libmar $MAKEFILES_extensions $MAKEFILES_startupcache diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk index 7861158a1c9..2ebc7ff1a08 100644 --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk @@ -77,11 +77,6 @@ ifndef MOZ_NATIVE_JPEG tier_platform_dirs += jpeg endif -# Installer needs standalone libjar, hence standalone zlib -ifdef MOZ_INSTALLER -tier_platform_dirs += modules/zlib/standalone -endif - ifdef MOZ_UPDATER ifndef MOZ_NATIVE_BZ2 tier_platform_dirs += modules/libbz2