summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtchang%redhat.com <devnull@localhost>2005-03-09 03:23:39 +0000
committerwtchang%redhat.com <devnull@localhost>2005-03-09 03:23:39 +0000
commitde7a255880416b87f419db232e702d7ac5eeede8 (patch)
tree1f7ebb8f07cb83311f61173b5529729571a35888
parentb656efeea8a518b03c4fa54156b27457d153762b (diff)
downloadnspr-hg-de7a255880416b87f419db232e702d7ac5eeede8.tar.gz
Bugzilla Bug 195222: removed obsolete NSPR makefiles.
Removed Files: makefile.win gmakefile.win Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
-rw-r--r--gmakefile.win96
-rw-r--r--makefile.win127
2 files changed, 0 insertions, 223 deletions
diff --git a/gmakefile.win b/gmakefile.win
deleted file mode 100644
index 80e8809a..00000000
--- a/gmakefile.win
+++ /dev/null
@@ -1,96 +0,0 @@
-#!gmake
-# -*- Mode: Makefile -*-
-#
-# ***** 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 the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 *****
-
-
-ifndef MOZ_SRC_FLIPPED
-$(error MOZ_SRC_FLIPPED is not set)
-endif
-
-ifndef MOZ_TOP
-MOZ_TOP=mozilla
-endif
-
-MOZ_DIST_FLIPPED = $(MOZ_SRC_FLIPPED)/mozilla/dist
-
-ifdef MOZ_DEBUG
-MOZ_OBJDIR = WIN32_D.OBJ
-else
-MOZ_OBJDIR = WIN32_O.OBJ
-endif
-
-NSPR_CONFIGURE := ../configure \
- --with-mozilla \
- --with-dist-prefix=$(MOZ_DIST_FLIPPED) \
- --with-dist-bindir=$(MOZ_DIST_FLIPPED)/$(MOZ_OBJDIR)/bin \
- --with-dist-libdir=$(MOZ_DIST_FLIPPED)/$(MOZ_OBJDIR)/lib
-
-ifeq (,$(MOZ_DEBUG)$(MOZ_TRACE_MALLOC))
-NSPR_CONFIGURE := $(NSPR_CONFIGURE) --enable-optimize --disable-debug
-endif
-
-define MAKE_OBJDIR
-if test ! -d $(@D) ; then rm -rf $(@D) ; nsinstall -D $(@D) ; fi
-endef
-
-
-all:: build_all
-
-# Argh. nmake keeps the cwd from cmd to cmd and gmake does not
-# Furthermore, shmsdos doesn't support '&&' so there's a chance the
-# 'cd' could fail and configure would be run in the wrong dir
-#
-$(MOZ_OBJDIR)/config.status: configure configure.in
- @$(MAKE_OBJDIR)
- cd $(MOZ_OBJDIR)/ ; \
- sh $(NSPR_CONFIGURE)
-
-build_all: $(MOZ_OBJDIR)/config.status check_old
- gmake -C $(MOZ_OBJDIR)
-
-clobber_all: $(MOZ_OBJDIR)/config.status check_old
- gmake -C $(MOZ_OBJDIR) clobber_all
-
-distclean: check_old
- rm -rf WIN32_D.OBJ WIN32_O.OBJ
-
-check_old:
- @if test -f Makefile; then gmake distclean; fi
-
-
-
diff --git a/makefile.win b/makefile.win
deleted file mode 100644
index 97beeabe..00000000
--- a/makefile.win
+++ /dev/null
@@ -1,127 +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 the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 *****
-
-
-#
-# An NMAKE file to set up and adjust NSPR20's build system for
-# Client build. Client build should invoke NMAKE on this file
-# instead of invoking gmake directly.
-#
-
-DEPTH = ..
-include <$(DEPTH)\config\config.mak>
-
-#
-# Backslashes are escape characters to gmake, so flip all backslashes
-# in $(MOZ_TOOLS) to forward slashes and pass that to gmake.
-#
-
-GMAKE = $(MOZ_TOOLS)\bin\gmake.exe
-
-GMAKE_FLAGS = MOZ_TOOLS_FLIPPED=$(MOZ_TOOLS:\=/) PR_CLIENT_BUILD=1 PR_CLIENT_BUILD_WINDOWS=1
-
-#
-# The Client's debug build uses MSVC's debug runtime library (/MDd).
-#
-
-!ifdef MOZ_DEBUG
-!else
-GMAKE_FLAGS = $(GMAKE_FLAGS) BUILD_OPT=1
-!endif
-
-!if "$(MOZ_BITS)" == "16"
-GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN16
-!else
-
-GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN95
-!ifdef MOZ_DEBUG
-!ifdef MOZ_NO_DEBUG_RTL
-!IF "$(CPU)" == "ALPHA"
-PR_OBJDIR = WIN954.0ALPHA_DBG.OBJ
-!else
-PR_OBJDIR = WIN954.0_DBG.OBJ
-!endif
-!else
-GMAKE_FLAGS = $(GMAKE_FLAGS) USE_DEBUG_RTL=1
-!IF "$(CPU)" == "ALPHA"
-PR_OBJDIR = WIN954.0ALPHA_DBG.OBJD
-!else
-PR_OBJDIR = WIN954.0_DBG.OBJD
-!endif
-!endif
-!else
-!IF "$(CPU)" == "ALPHA"
-PR_OBJDIR = WIN954.0ALPHA_OPT.OBJ
-!else
-PR_OBJDIR = WIN954.0_OPT.OBJ
-!endif
-!endif
-
-!endif
-
-
-#
-# The rules. Simply invoke gmake with the same target.
-# The default target is 'all'. For Win16, set up the
-# environment to use the Watcom compiler, Watcom headers,
-# and Watcom libs.
-#
-
-all:: export libs install
-
-export libs install clobber clobber_all clean depend::
-!if "$(MOZ_BITS)" == "16"
- set PATH=%WATCPATH%
- set INCLUDE=%WATC_INC%
- set LIB=%WATC_LIB%
-!endif
- $(GMAKE) $(GMAKE_FLAGS) $@
-!if "$(MOZ_BITS)" == "16"
- set PATH=%MSVCPATH%
- set INCLUDE=%MSVC_INC%
- set LIB=%MSVC_LIB%
-!endif
-
-!if "$(MOZ_BITS)" != "16"
-export::
- $(MAKE_INSTALL) $(XPDIST)\$(PR_OBJDIR)\include\*.h $(DIST)\include
- $(MAKE_INSTALL) $(XPDIST)\$(PR_OBJDIR)\include\obsolete\*.h $(DIST)\include\obsolete
- $(MAKE_INSTALL) $(XPDIST)\$(PR_OBJDIR)\include\private\*.h $(DIST)\include\private
- $(MAKE_INSTALL) $(XPDIST)\$(PR_OBJDIR)\lib\*.lib $(DIST)\lib
- $(MAKE_INSTALL) $(XPDIST)\$(PR_OBJDIR)\lib\*.dll $(DIST)\bin
-!endif