Bug 663810 - Remove modules/libreg/standalone. r=khuey
authorJustin Lebar <justin.lebar@gmail.com>
Mon, 13 Jun 2011 11:12:00 -0400
changeset 71327 98102c5784f6308c875baa83bb5090485b47a3b7
parent 71326 2d1746337846558b25a38594befd84200fda1ab1
child 71328 83b4a771ea456d3b1ac16a2cc4919d669440df3b
push id209
push userbzbarsky@mozilla.com
push dateTue, 05 Jul 2011 17:42:16 +0000
treeherdermozilla-aurora@cc6e30cce8af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs663810
milestone7.0a1
Bug 663810 - Remove modules/libreg/standalone. r=khuey
modules/libreg/Makefile.in
modules/libreg/standalone/Makefile.in
toolkit/toolkit-makefiles.sh
--- a/modules/libreg/Makefile.in
+++ b/modules/libreg/Makefile.in
@@ -39,12 +39,12 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= libreg
 
-DIRS		= include src standalone
+DIRS		= include src
 
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/modules/libreg/standalone/Makefile.in
+++ /dev/null
@@ -1,74 +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)/../src/objs.mk
-
-MODULE		= libreg
-LIBRARY_NAME	= mozregsa_s
-
-ifeq ($(OS_ARCH),WINNT)
-USE_STATIC_LIBS = 1
-endif
-
-CSRCS		= $(MODULES_LIBREG_SRC_LCSRCS)
-
-FORCE_STATIC_LIB = 1
-
-GARBAGE		+= $(MODULES_LIBREG_SRC_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
-
-ifeq ($(OS_ARCH),WINNT)
-GARBAGE		+= $(addprefix $(srcdir)/,$(MODULES_LIBREG_SRC_LCSRCS))
-endif
-
-SRCS_IN_OBJDIR = 1
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES += -DSTANDALONE_REGISTRY
-
-LOCAL_INCLUDES = -I$(srcdir)/../src
-
-export:: $(MODULES_LIBREG_SRC_CSRCS)
-	$(INSTALL) $^ .
-
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -306,17 +306,16 @@ MAKEFILES_libjar="
   modules/libjar/Makefile
   modules/libjar/test/Makefile
 "
 
 MAKEFILES_libreg="
   modules/libreg/Makefile
   modules/libreg/include/Makefile
   modules/libreg/src/Makefile
-  modules/libreg/standalone/Makefile
 "
 
 MAKEFILES_libpref="
   modules/libpref/Makefile
   modules/libpref/public/Makefile
   modules/libpref/src/Makefile
 "