From 00fc5e9111f7fdf87510972cf31ccd393171ba28 Mon Sep 17 00:00:00 2001
From: Ed Morley <bmo@edmorley.co.uk>
Date: Wed, 30 Nov 2011 18:37:57 +0000
Subject: [PATCH] Bug 696498 - Clean up mobile/xul/makefiles.sh; r=khuey

* Removes various non-mobile Makefile entries, since they already exist in
  toolkit-makefiles.sh (which is always run unless --with-libxul-sdk used)
* Adds missing $MOZ_BRANDING_DIRECTORY/content/Makefile
* Moves mobile/xul/chrome/tests/Makefile to ENABLE_TESTS conditional
---
 mobile/xul/makefiles.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/mobile/xul/makefiles.sh b/mobile/xul/makefiles.sh
index 95a6759ed5b..72136b0cf20 100644
--- a/mobile/xul/makefiles.sh
+++ b/mobile/xul/makefiles.sh
@@ -36,26 +36,23 @@
 # ***** END LICENSE BLOCK *****
 
 add_makefiles "
-netwerk/locales/Makefile
-dom/locales/Makefile
-toolkit/locales/Makefile
-security/manager/locales/Makefile
 mobile/xul/app/Makefile
 mobile/xul/app/profile/extensions/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
+$MOZ_BRANDING_DIRECTORY/content/Makefile
 $MOZ_BRANDING_DIRECTORY/locales/Makefile
 mobile/xul/chrome/Makefile
-mobile/xul/chrome/tests/Makefile
 mobile/xul/components/Makefile
 mobile/xul/components/build/Makefile
 mobile/xul/modules/Makefile
 mobile/xul/installer/Makefile
 mobile/xul/locales/Makefile
 mobile/xul/Makefile
-mobile/xul/themes/core/Makefile"
+mobile/xul/themes/core/Makefile
+"
 
-if test -n "$MOZ_UPDATE_PACKAGING"; then
-   add_makefiles "
-     tools/update-packaging/Makefile
-   "
+if [ "$ENABLE_TESTS" ]; then
+  add_makefiles "
+    mobile/xul/chrome/tests/Makefile
+  "
 fi