From 67977b416e608cf90168bbe87aa36b815824d461 Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@meer.net>
Date: Fri, 5 Dec 2008 09:25:19 -0800
Subject: [PATCH] Backed out changeset 555e338a03ca

---
 extensions/Makefile.in       | 85 +++++++++++++++++-------------------
 security/manager/Makefile.in | 22 ----------
 2 files changed, 39 insertions(+), 68 deletions(-)

diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index b41c592eb750..40ee615e3bae 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -1,54 +1,47 @@
-DEPTH		= ../..
+#
+# ***** 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):
+#
+# 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
 
-XPIDL_MODULE   = wifi_geolocation_provider
-
-IS_COMPONENT = 1
-MODULE       = wifi_geolocation_provider
-LIBRARY_NAME = wifi_geolocation_provider
-USE_STATIC_LIBS = 1
-#MOZILLA_INTERNAL_API = 1
-
-REQUIRES = 	xpcom \
-		string \
-		dom \
-		content \
-		necko \
-		js \
-		xpconnect \
-		$(NULL)
-
-CPPSRCS	=	WifiLocationProvider.cpp \
-		WifiScannerPosition.cpp \
-		WifiScannerCommon.cpp \
-		$(NULL)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CPPSRCS	+= WifiScannerMac.cpp
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-CPPSRCS	+= WifiScannerWin.cpp
-else
-CPPSRCS	+= WifiScannerUnix.cpp
-EXTRA_DSO_LDOPTS += -liw
-endif # windows
-endif # mac
-
-
-XPIDLSRCS = INetworkLocationHandler.idl
+DIRS		= $(MOZ_EXTENSIONS)
 
 include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += \
-  $(XPCOM_GLUE_LDOPTS) \
-  $(XPCOM_FROZEN_LDOPTS) \
-  $(EXTRA_DSO_LIBS) \
-  $(XPCOM_LIBS) \
-  $(MOZ_JS_LIBS) \
-  $(NSPR_LIBS) \
-  $(NULL)
-
diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index a9bc8326cc75..ed1f4ec625e9 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -219,26 +219,6 @@ DEFAULT_GMAKE_FLAGS += MACOS_SDK_DIR=$(MACOS_SDK_DIR)
 endif
 endif
 ifdef CROSS_COMPILE
-
-ifdef WINCE
-DEFAULT_GMAKE_FLAGS += \
-	NSINSTALL="$(NSINSTALL)" \
-	NATIVE_CC="$(HOST_CC)" \
-	CC="arm-wince-gcc.exe" \
-	CCC="arm-wince-gcc.exe" \
-	LINK="arm-wince-link.exe" \
-	LD="arm-wince-link.exe -DLL" \
-	AS="arm-wince-as.exe -Cp -Sn -Zi -coff $(INCLUDES)" \
-	AR='arm-wince-lib -NOLOG0 -OUT:$$@' \
-	RANLIB="echo" \
-	RC="arm-wince-res.exe $(RCFLAGS)" \
-	OS_ARCH="$(OS_ARCH)" \
-	OS_TEST="$(OS_TEST)" \
-	CPU_ARCH="ARM" \
-	USE_MSYS=1 \
-	WINCE=1 \
-	$(NULL)
-else
 DEFAULT_GMAKE_FLAGS += \
 	NSINSTALL="$(NSINSTALL)" \
 	NATIVE_CC="$(HOST_CC)" \
@@ -253,8 +233,6 @@ DEFAULT_GMAKE_FLAGS += \
 	OS_TEST="$(OS_TEST)" \
 	CPU_ARCH="$(TARGET_CPU)" \
 	$(NULL)
-endif
-
 SKIP_CHK=1
 endif
 SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile locales/Makefile