bug 542222 - Reduce recursion in makefiles r=ted.mielczarek r=robert.bugzilla
authorMitchell Field <mitch_1_2@live.com.au>
Tue, 26 Jan 2010 07:11:00 -0500
changeset 37929 20041732bece21e72224f6c833ab1afbafe1ed7e
parent 37928 cf63181a4e51053eb2e4fe5c3a9afe1a988ccaf6
child 37930 a4b5e469cf2ca56cf8cd3dee3fc6fdffa4f83cf3
push idunknown
push userunknown
push dateunknown
reviewersted, robert
bugs542222
milestone1.9.3a2pre
bug 542222 - Reduce recursion in makefiles r=ted.mielczarek r=robert.bugzilla
toolkit/mozapps/installer/wince/Makefile.in
toolkit/mozapps/update/Makefile.in
toolkit/mozapps/update/nsIUpdateService.idl
toolkit/mozapps/update/nsIUpdateTimerManager.idl
toolkit/mozapps/update/nsUpdateService.js
toolkit/mozapps/update/nsUpdateServiceStub.js
toolkit/mozapps/update/nsUpdateTimerManager.js
toolkit/mozapps/update/public/Makefile.in
toolkit/mozapps/update/public/nsIUpdateService.idl
toolkit/mozapps/update/public/nsIUpdateTimerManager.idl
toolkit/mozapps/update/src/Makefile.in
toolkit/mozapps/update/src/nsUpdateService.js.in
toolkit/mozapps/update/src/nsUpdateServiceStub.js
toolkit/mozapps/update/src/nsUpdateTimerManager.js
toolkit/mozapps/update/src/updater/Makefile.in
toolkit/mozapps/update/src/updater/archivereader.cpp
toolkit/mozapps/update/src/updater/archivereader.h
toolkit/mozapps/update/src/updater/bspatch.cpp
toolkit/mozapps/update/src/updater/bspatch.h
toolkit/mozapps/update/src/updater/launchchild_osx.mm
toolkit/mozapps/update/src/updater/macbuild/Contents/Info.plist
toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/info.nib
toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/updater.icns
toolkit/mozapps/update/src/updater/module.ver
toolkit/mozapps/update/src/updater/progressui.h
toolkit/mozapps/update/src/updater/progressui_gtk.cpp
toolkit/mozapps/update/src/updater/progressui_null.cpp
toolkit/mozapps/update/src/updater/progressui_osx.mm
toolkit/mozapps/update/src/updater/progressui_win.cpp
toolkit/mozapps/update/src/updater/resource.h
toolkit/mozapps/update/src/updater/updater.cpp
toolkit/mozapps/update/src/updater/updater.exe.manifest
toolkit/mozapps/update/src/updater/updater.ico
toolkit/mozapps/update/src/updater/updater.png
toolkit/mozapps/update/src/updater/updater.rc
toolkit/mozapps/update/src/updater/updater_wince.cpp
toolkit/mozapps/update/src/updater/updater_wince.h
toolkit/mozapps/update/src/updater/updater_wince.rc
toolkit/mozapps/update/src/updater/updater_winmo.rc
toolkit/mozapps/update/test/Makefile.in
toolkit/mozapps/update/updater/Makefile.in
toolkit/mozapps/update/updater/archivereader.cpp
toolkit/mozapps/update/updater/archivereader.h
toolkit/mozapps/update/updater/bspatch.cpp
toolkit/mozapps/update/updater/bspatch.h
toolkit/mozapps/update/updater/launchchild_osx.mm
toolkit/mozapps/update/updater/macbuild/Contents/Info.plist
toolkit/mozapps/update/updater/macbuild/Contents/PkgInfo
toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/info.nib
toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
toolkit/mozapps/update/updater/macbuild/Contents/Resources/updater.icns
toolkit/mozapps/update/updater/module.ver
toolkit/mozapps/update/updater/progressui.h
toolkit/mozapps/update/updater/progressui_gtk.cpp
toolkit/mozapps/update/updater/progressui_null.cpp
toolkit/mozapps/update/updater/progressui_osx.mm
toolkit/mozapps/update/updater/progressui_win.cpp
toolkit/mozapps/update/updater/resource.h
toolkit/mozapps/update/updater/updater.cpp
toolkit/mozapps/update/updater/updater.exe.manifest
toolkit/mozapps/update/updater/updater.ico
toolkit/mozapps/update/updater/updater.png
toolkit/mozapps/update/updater/updater.rc
toolkit/mozapps/update/updater/updater_wince.cpp
toolkit/mozapps/update/updater/updater_wince.h
toolkit/mozapps/update/updater/updater_wince.rc
toolkit/mozapps/update/updater/updater_winmo.rc
toolkit/toolkit-makefiles.sh
--- a/toolkit/mozapps/installer/wince/Makefile.in
+++ b/toolkit/mozapps/installer/wince/Makefile.in
@@ -40,27 +40,27 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 export NO_SHUNT = 1
 USE_STATIC_LIBS = 1
 
-PROGRAM   = xulrunner-stub-installer.sfx
+PROGRAM = xulrunner-stub-installer.sfx
 
-REQUIRES  = lib7z
+REQUIRES = lib7z
 
 CPPSRCS = \
-	nsInstaller.cpp \
-	nsInstallerDlg.cpp \
-	nsArchiveExtractor.cpp \
-	ns7zipExtractor.cpp \
-	nsSetupStrings.cpp \
-	$(NULL)
+  nsInstaller.cpp \
+  nsInstallerDlg.cpp \
+  nsArchiveExtractor.cpp \
+  ns7zipExtractor.cpp \
+  nsSetupStrings.cpp \
+  $(NULL)
 
 LOCAL_INCLUDES += -I$(srcdir)/../../readstrings
 
 RCINCLUDE = nsInstallerppc.rc
 
 DEFINES += -D_UNICODE
 
 LIBS += $(DEPTH)/toolkit/mozapps/readstrings/$(LIB_PREFIX)readstrings.$(LIB_SUFFIX) \
@@ -69,9 +69,8 @@ LIBS += $(DEPTH)/toolkit/mozapps/readstr
 
 OS_LIBS += aygshell.lib commctrl.lib note_prj.lib oleaut32.lib ole32.lib libcmt.lib coredll.lib corelibc.lib
 
 WIN32_EXE_LDFLAGS += -ENTRY:WinMain
 
 DIRS += uninstall
 
 include $(topsrcdir)/config/rules.mk
-
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -30,24 +30,41 @@
 # 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@
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src
+MODULE = update
+
+XPIDLSRCS = nsIUpdateTimerManager.idl
+
+EXTRA_PP_COMPONENTS = nsUpdateTimerManager.js
+
+ifdef MOZ_UPDATER
+DIRS = ../readstrings \
+  updater \
+  $(NULL)
+
+XPIDLSRCS += nsIUpdateService.idl
+
+EXTRA_PP_COMPONENTS += \
+  nsUpdateService.js \
+  nsUpdateServiceStub.js \
+  $(NULL)
+endif
 
 ifdef ENABLE_TESTS
 DIRS += test_timermanager
 # Update tests require the updater binary
 ifdef MOZ_UPDATER
 DIRS += test
 endif
 endif
rename from toolkit/mozapps/update/public/nsIUpdateService.idl
rename to toolkit/mozapps/update/nsIUpdateService.idl
rename from toolkit/mozapps/update/public/nsIUpdateTimerManager.idl
rename to toolkit/mozapps/update/nsIUpdateTimerManager.idl
rename from toolkit/mozapps/update/src/nsUpdateService.js.in
rename to toolkit/mozapps/update/nsUpdateService.js
rename from toolkit/mozapps/update/src/nsUpdateServiceStub.js
rename to toolkit/mozapps/update/nsUpdateServiceStub.js
rename from toolkit/mozapps/update/src/nsUpdateTimerManager.js
rename to toolkit/mozapps/update/nsUpdateTimerManager.js
deleted file mode 100644
--- a/toolkit/mozapps/update/public/Makefile.in
+++ /dev/null
@@ -1,54 +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 Extension Manager.
-#
-# The Initial Developer of the Original Code is Ben Goodger.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Ben Goodger <ben@mozilla.org>
-#
-# 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
-
-MODULE        = update
-XPIDL_MODULE  = update
-
-XPIDLSRCS = nsIUpdateTimerManager.idl
-
-ifdef MOZ_UPDATER
-XPIDLSRCS += nsIUpdateService.idl
-endif
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/toolkit/mozapps/update/src/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# ***** 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
-
-MODULE = update
-
-EXTRA_PP_COMPONENTS = nsUpdateTimerManager.js
-
-ifdef MOZ_UPDATER
-DIRS = ../../readstrings \
-  updater \
-  $(NULL)
-
-EXTRA_PP_COMPONENTS += nsUpdateServiceStub.js
-
-EXTRA_COMPONENTS = nsUpdateService.js
-GARBAGE += nsUpdateService.js
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_UPDATER
-nsUpdateService.js: nsUpdateService.js.in
-	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $@ 
-endif
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -30,46 +30,46 @@
 # 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 = ../../../..
+DEPTH     = ../../../..
 topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = test_update
 
 XPCSHELL_TESTS = \
   unit \
   $(NULL)
 
-TESTROOT	= $(shell cd $(DEPTH) && pwd)/_tests/xpcshell/$(MODULE)
+TESTROOT = $(call core_abspath,$(DEPTH))/_tests/xpcshell/$(MODULE)
 
 CPPSRCS = \
   TestAUSReadStrings.cpp \
   $(NULL)
 
 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 INI_TEST_FILES = \
   TestAUSReadStrings1.ini \
   TestAUSReadStrings2.ini \
   TestAUSReadStrings3.ini \
   $(NULL)
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
-  -I$(topsrcdir)/toolkit/mozapps/update/src \
+  -I$(topsrcdir)/toolkit/mozapps/update \
   $(NULL)
 
 MOZ_WINCONSOLE = 1
 
 DEFINES += \
   -DAB_CD=$(AB_CD) \
   -DNS_NO_XPCOM \
   $(NULL)
rename from toolkit/mozapps/update/src/updater/Makefile.in
rename to toolkit/mozapps/update/updater/Makefile.in
--- a/toolkit/mozapps/update/src/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@@ -31,83 +31,82 @@
 # 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@
+DEPTH     = ../../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 CPPSRCS = \
-	updater.cpp \
-	bspatch.cpp \
-	archivereader.cpp \
-	$(NULL)
+  updater.cpp \
+  bspatch.cpp \
+  archivereader.cpp \
+  $(NULL)
 
 PROGRAM = updater$(BIN_SUFFIX)
 
-LOCAL_INCLUDES += -I$(srcdir)/../../../readstrings
+LOCAL_INCLUDES += -I$(srcdir)/../../readstrings
 
 LIBS += \
-	$(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
-	../../../readstrings/$(LIB_PREFIX)readstrings.$(LIB_SUFFIX) \
-	$(BZ2_LIBS) \
-	$(NULL)
+  $(DEPTH)/modules/libmar/src/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+  ../../readstrings/$(LIB_PREFIX)readstrings.$(LIB_SUFFIX) \
+  $(BZ2_LIBS) \
+  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 HAVE_PROGRESSUI = 1
 RCINCLUDE = updater.rc
 CPPSRCS += \
-	progressui_win.cpp \
-	$(NULL)
+  progressui_win.cpp \
+  $(NULL)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
 DEFINES += -DUNICODE -D_UNICODE
 ifndef GNU_CC
 RCFLAGS += -I$(srcdir)
 else
 RCFLAGS += --include-dir $(srcdir)
 endif
 
 endif
 
 ifeq ($(OS_ARCH),WINCE)
 export NO_SHUNT = 1
 USE_STATIC_LIBS = 1
 HAVE_PROGRESSUI = 1
 CPPSRCS += \
-	updater_wince.cpp \
-	progressui_win.cpp \
-	$(NULL)
+  updater_wince.cpp \
+  progressui_win.cpp \
+  $(NULL)
 OS_LIBS += $(call EXPAND_LIBNAME,commctrl ws2)
 ifdef WINCE_WINDOWS_MOBILE
 OS_LIBS += $(call EXPAND_LIBNAME,aygshell)
 RCINCLUDE = updater_winmo.rc
 else
 RCINCLUDE = updater_wince.rc
 endif
 DEFINES += -DUNICODE -D_UNICODE -DWINCE_SKIP_SHUNT_INCLUDE
 RCFLAGS += -I$(srcdir)
 LOCAL_INCLUDES += -I$(topsrcdir)/build/wince/shunt/include \
                   -I$(topsrcdir)/build/wince/shunt
 endif
 
 ifneq ($(MOZ_ENABLE_GTK2),)
 HAVE_PROGRESSUI = 1
 CPPSRCS += \
-	progressui_gtk.cpp \
-	$(NULL)
+  progressui_gtk.cpp \
+  $(NULL)
 OS_CXXFLAGS += $(TK_CFLAGS)
 OS_LIBS += $(TK_LIBS)
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 HAVE_PROGRESSUI = 1
 CMMSRCS += progressui_osx.mm launchchild_osx.mm
 OS_LIBS += -framework Cocoa
rename from toolkit/mozapps/update/src/updater/archivereader.cpp
rename to toolkit/mozapps/update/updater/archivereader.cpp
rename from toolkit/mozapps/update/src/updater/archivereader.h
rename to toolkit/mozapps/update/updater/archivereader.h
rename from toolkit/mozapps/update/src/updater/bspatch.cpp
rename to toolkit/mozapps/update/updater/bspatch.cpp
rename from toolkit/mozapps/update/src/updater/bspatch.h
rename to toolkit/mozapps/update/updater/bspatch.h
rename from toolkit/mozapps/update/src/updater/launchchild_osx.mm
rename to toolkit/mozapps/update/updater/launchchild_osx.mm
rename from toolkit/mozapps/update/src/updater/macbuild/Contents/Info.plist
rename to toolkit/mozapps/update/updater/macbuild/Contents/Info.plist
rename from toolkit/mozapps/update/src/updater/macbuild/Contents/PkgInfo
rename to toolkit/mozapps/update/updater/macbuild/Contents/PkgInfo
rename from toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
rename to toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in
rename from toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
rename to toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
rename from toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/info.nib
rename to toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/info.nib
rename from toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
rename to toolkit/mozapps/update/updater/macbuild/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
rename from toolkit/mozapps/update/src/updater/macbuild/Contents/Resources/updater.icns
rename to toolkit/mozapps/update/updater/macbuild/Contents/Resources/updater.icns
rename from toolkit/mozapps/update/src/updater/module.ver
rename to toolkit/mozapps/update/updater/module.ver
rename from toolkit/mozapps/update/src/updater/progressui.h
rename to toolkit/mozapps/update/updater/progressui.h
rename from toolkit/mozapps/update/src/updater/progressui_gtk.cpp
rename to toolkit/mozapps/update/updater/progressui_gtk.cpp
rename from toolkit/mozapps/update/src/updater/progressui_null.cpp
rename to toolkit/mozapps/update/updater/progressui_null.cpp
rename from toolkit/mozapps/update/src/updater/progressui_osx.mm
rename to toolkit/mozapps/update/updater/progressui_osx.mm
rename from toolkit/mozapps/update/src/updater/progressui_win.cpp
rename to toolkit/mozapps/update/updater/progressui_win.cpp
rename from toolkit/mozapps/update/src/updater/resource.h
rename to toolkit/mozapps/update/updater/resource.h
rename from toolkit/mozapps/update/src/updater/updater.cpp
rename to toolkit/mozapps/update/updater/updater.cpp
rename from toolkit/mozapps/update/src/updater/updater.exe.manifest
rename to toolkit/mozapps/update/updater/updater.exe.manifest
rename from toolkit/mozapps/update/src/updater/updater.ico
rename to toolkit/mozapps/update/updater/updater.ico
rename from toolkit/mozapps/update/src/updater/updater.png
rename to toolkit/mozapps/update/updater/updater.png
rename from toolkit/mozapps/update/src/updater/updater.rc
rename to toolkit/mozapps/update/updater/updater.rc
rename from toolkit/mozapps/update/src/updater/updater_wince.cpp
rename to toolkit/mozapps/update/updater/updater_wince.cpp
rename from toolkit/mozapps/update/src/updater/updater_wince.h
rename to toolkit/mozapps/update/updater/updater_wince.h
rename from toolkit/mozapps/update/src/updater/updater_wince.rc
rename to toolkit/mozapps/update/updater/updater_wince.rc
rename from toolkit/mozapps/update/src/updater/updater_winmo.rc
rename to toolkit/mozapps/update/updater/updater_winmo.rc
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -749,19 +749,17 @@ MAKEFILES_xulapp="
   toolkit/components/viewsource/Makefile
   toolkit/locales/Makefile
   toolkit/mozapps/Makefile
   toolkit/mozapps/downloads/Makefile
   toolkit/mozapps/extensions/Makefile
   toolkit/mozapps/handling/Makefile
   toolkit/mozapps/plugins/Makefile
   toolkit/mozapps/update/Makefile
-  toolkit/mozapps/update/public/Makefile
-  toolkit/mozapps/update/src/Makefile
-  toolkit/mozapps/update/src/updater/Makefile
+  toolkit/mozapps/update/updater/Makefile
   toolkit/mozapps/xpinstall/Makefile
   toolkit/profile/Makefile
   toolkit/profile/public/Makefile
   toolkit/profile/src/Makefile
   toolkit/system/dbus/Makefile
   toolkit/system/gnome/Makefile
   toolkit/system/unixproxy/Makefile
   toolkit/system/osxproxy/Makefile