Bug 696498 - Clean up browser/makefiles.sh; r=khuey
authorEd Morley <bmo@edmorley.co.uk>
Wed, 30 Nov 2011 18:37:57 +0000
changeset 82675 79f0181b02f841265e0b154a5594a50727a8396b
parent 82674 bbbe2010c4ba1c6a44ff703f55bf3e796e101df5
child 82676 1c529c4c2e04133d1329a5226edb33f5be5d7595
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs696498, 701212
milestone11.0a1
Bug 696498 - Clean up browser/makefiles.sh; r=khuey * Adds ~20 omitted makefiles, under appropriate conditionals * Moves some of the existing entries to platform/feature conditionals * Removes browser/themes/*/browser/Makefile since bug 701212 deleted them
browser/makefiles.sh
--- a/browser/makefiles.sh
+++ b/browser/makefiles.sh
@@ -34,71 +34,122 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 add_makefiles "
 browser/Makefile
 browser/app/Makefile
 browser/app/profile/extensions/Makefile
+browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile
 browser/base/Makefile
 browser/components/Makefile
+browser/components/about/Makefile
 browser/components/build/Makefile
 browser/components/certerror/Makefile
 browser/components/dirprovider/Makefile
 browser/components/feeds/Makefile
 browser/components/feeds/public/Makefile
 browser/components/feeds/src/Makefile
 browser/components/migration/Makefile
 browser/components/migration/public/Makefile
 browser/components/migration/src/Makefile
 browser/components/places/Makefile
 browser/components/places/src/Makefile
 browser/components/preferences/Makefile
 browser/components/privatebrowsing/Makefile
 browser/components/privatebrowsing/src/Makefile
-browser/components/safebrowsing/Makefile
 browser/components/search/Makefile
 browser/components/sessionstore/Makefile
 browser/components/sessionstore/src/Makefile
 browser/components/sidebar/src/Makefile
 browser/components/shell/Makefile
 browser/components/shell/public/Makefile
 browser/components/shell/src/Makefile
-browser/components/wintaskbar/Makefile
+browser/components/tabview/Makefile
+browser/devtools/Makefile
+browser/devtools/highlighter/Makefile
+browser/devtools/shared/Makefile
+browser/devtools/sourceeditor/Makefile
+browser/devtools/styleinspector/Makefile
+browser/devtools/webconsole/Makefile
 browser/fuel/Makefile
 browser/fuel/public/Makefile
 browser/fuel/src/Makefile
 browser/installer/Makefile
-browser/installer/windows/Makefile
 browser/locales/Makefile
 browser/themes/Makefile
-browser/themes/pinstripe/browser/Makefile
-browser/themes/pinstripe/communicator/Makefile
-browser/themes/pinstripe/Makefile
-browser/themes/winstripe/browser/Makefile
-browser/themes/winstripe/communicator/Makefile
-browser/themes/winstripe/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
 $MOZ_BRANDING_DIRECTORY/content/Makefile
 $MOZ_BRANDING_DIRECTORY/locales/Makefile
 "
 
+if [ "$MOZ_SAFE_BROWSING" ]; then
+  add_makefiles "
+    browser/components/safebrowsing/Makefile
+  "
+fi
+
+if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
+  add_makefiles "
+    browser/components/wintaskbar/Makefile
+  "
+  if [ "$MOZ_INSTALLER" ]; then
+    add_makefiles "
+      browser/installer/windows/Makefile
+    "
+  fi
+fi
+
+if [ "$MOZ_WIDGET_TOOLKIT" = "gtk2" -o "$MOZ_WIDGET_TOOLKIT" = "qt" ]; then
+  add_makefiles "
+    browser/themes/gnomestripe/Makefile
+    browser/themes/gnomestripe/communicator/Makefile
+  "
+elif [ "$MOZ_WIDGET_TOOLKIT" = "cocoa" ]; then
+  add_makefiles "
+    browser/themes/pinstripe/Makefile
+    browser/themes/pinstripe/communicator/Makefile
+  "
+else
+  add_makefiles "
+    browser/themes/winstripe/Makefile
+    browser/themes/winstripe/communicator/Makefile
+  "
+fi
+
 if [ "$ENABLE_TESTS" ]; then
   add_makefiles "
     browser/base/content/test/Makefile
     browser/components/certerror/test/Makefile
+    browser/components/dirprovider/tests/Makefile
     browser/components/preferences/tests/Makefile
     browser/components/search/test/Makefile
     browser/components/sessionstore/test/browser/Makefile
     browser/components/shell/test/Makefile
     browser/components/feeds/test/Makefile
     browser/components/feeds/test/chrome/Makefile
     browser/components/places/tests/Makefile
     browser/components/places/tests/chrome/Makefile
     browser/components/places/tests/browser/Makefile
     browser/components/privatebrowsing/test/Makefile
     browser/components/privatebrowsing/test/browser/Makefile
-    browser/components/safebrowsing/content/test/Makefile
-    browser/components/wintaskbar/test/Makefile
+    browser/components/tabview/test/Makefile
+    browser/components/test/browser/Makefile
+    browser/devtools/highlighter/test/Makefile
+    browser/devtools/scratchpad/test/Makefile
+    browser/devtools/shared/test/Makefile
+    browser/devtools/sourceeditor/test/Makefile
+    browser/devtools/styleinspector/test/browser/Makefile
+    browser/devtools/webconsole/test/browser/Makefile
     browser/fuel/test/Makefile
   "
+  if [ "$MOZ_SAFE_BROWSING" ]; then
+    add_makefiles "
+      browser/components/safebrowsing/content/test/Makefile
+    "
+  fi
+  if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
+    add_makefiles "
+      browser/components/wintaskbar/test/Makefile
+    "
+  fi
 fi