Bug 505784: nuke STANDALONE mode in libjar r=bsmedberg

This commit is contained in:
Taras Glek 2009-07-22 14:43:10 -07:00
parent bfa66f0835
commit cb476993e2
2 changed files with 0 additions and 94 deletions

View File

@ -50,17 +50,6 @@ ifdef MOZ_ZIPWRITER
DIRS += zipwriter
endif
ifdef MOZ_INSTALLER
# Linux and Solaris installer needs standalone libjar
DIRS += standalone
# Make this a true dynamic component even in static builds because
# this component is shared by installer
ifndef MOZ_ENABLE_LIBXUL
BUILD_STATIC_LIBS=
endif
endif
ifdef ENABLE_TESTS
TOOL_DIRS += test
endif

View File

@ -1,83 +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 <sgehani@netscape.com>
#
# 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)/../objs.mk
MODULE = jar
LIBRARY_NAME = jar$(VERSION_NUMBER)_s
REQUIRES = zlib \
$(NULL)
#DEP_XPIDLSRCS = $(MODULES_LIBJAR_XPIDLSRCS)
#EXPORTS = $(MODULES_LIBJAR_LEXPORTS)
CPPSRCS = $(MODULES_STANDALONE_LCPPSRCS)
FORCE_STATIC_LIB = 1
ifneq ($(OS_ARCH),WINNT)
SHARED_LIBRARY_LIBS = $(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX)
endif
GARBAGE += $(MODULES_STANDALONE_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
ifeq ($(OS_ARCH),WINNT)
USE_STATIC_LIBS=1
GARBAGE += $(addprefix $(srcdir)/,$(MODULES_STANDALONE_LCPPSRCS))
endif
ifeq ($(OS_ARCH),OS2)
USE_STATIC_LIBS=1
endif
SRCS_IN_OBJDIR = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DSTANDALONE
LOCAL_INCLUDES = -I$(srcdir)/..
export:: $(MODULES_STANDALONE_CPPSRCS)
$(INSTALL) $^ .