Bug 696498 - Clean up allmakefiles.sh; r=khuey
authorEd Morley <bmo@edmorley.co.uk>
Wed, 30 Nov 2011 18:37:57 +0000
changeset 81623 bbbe2010c4ba1c6a44ff703f55bf3e796e101df5
parent 81622 e837d33a508be4fab8cfc0760f309403d7f21b9a
child 81624 79f0181b02f841265e0b154a5594a50727a8396b
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs696498
milestone11.0a1
Bug 696498 - Clean up allmakefiles.sh; r=khuey * Adds 11 omitted makefiles, under appropriate conditionals * Moves some of the existing makefile entries to platform/compiler conditionals
allmakefiles.sh
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -47,62 +47,107 @@ MAKEFILES=""
 add_makefiles() {
   MAKEFILES="$MAKEFILES $*"
 }
 
 if [ "$srcdir" = "" ]; then
   srcdir=.
 fi
 
-#
 # Common makefiles used by everyone
-#
 add_makefiles "
 Makefile
 build/Makefile
 build/pgo/Makefile
 build/pgo/blueprint/Makefile
 build/pgo/js-input/Makefile
-build/unix/Makefile
-build/win32/Makefile
-build/win32/crashinjectdll/Makefile
 config/Makefile
 config/autoconf.mk
-config/mkdepend/Makefile
 config/nspr/Makefile
 config/doxygen.cfg
 config/expandlibs_config.py
 config/tests/src-simple/Makefile
 probes/Makefile
 extensions/Makefile
 "
 
-if [ "$MOZ_MEMORY" -a "$LIBXUL_SDK" = "" ]; then
+if [ ! "$LIBXUL_SDK" ]; then
   add_makefiles "
-    memory/jemalloc/Makefile
+    memory/Makefile
+    memory/mozalloc/Makefile
+    memory/mozutils/Makefile
+  "
+  if [ "$MOZ_MEMORY" ]; then
+    add_makefiles "
+      memory/jemalloc/Makefile
+    "
+  fi
+  if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
+    add_makefiles "
+      other-licenses/android/Makefile
+    "
+  fi
+fi
+
+if [ "$OS_ARCH" = "WINNT" ]; then
+  add_makefiles "
+    build/win32/Makefile
+    build/win32/crashinjectdll/Makefile
   "
 fi
 
-#
+if [ "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" ]; then
+  add_makefiles "
+    build/unix/Makefile
+  "
+  if [ "$USE_ELF_HACK" ]; then
+    add_makefiles "
+      build/unix/elfhack/Makefile
+    "
+  fi
+fi
+
+if [ "$COMPILER_DEPEND" = "" -a "$MOZ_NATIVE_MAKEDEPEND" = "" ]; then
+  add_makefiles "
+    config/mkdepend/Makefile
+  "
+fi
+
+if [ "$ENABLE_TESTS" ]; then
+  if [ "$_MSC_VER" -a "$OS_TEST" != "x86_64" ]; then
+    add_makefiles "
+      build/win32/vmwarerecordinghelper/Makefile
+    "
+  fi
+  if [ "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "OS2" ]; then 
+    add_makefiles "
+      build/unix/test/Makefile
+    "
+  fi
+  if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
+    add_makefiles "
+      build/mobile/sutagent/android/Makefile
+      build/mobile/sutagent/android/fencp/Makefile
+      build/mobile/sutagent/android/ffxcp/Makefile
+      build/mobile/sutagent/android/watcher/Makefile
+    "
+  fi
+fi
+
 # Application-specific makefiles
-#
-if test -f "${srcdir}/${MOZ_BUILD_APP}/makefiles.sh"; then
+if [ -f "${srcdir}/${MOZ_BUILD_APP}/makefiles.sh" ]; then
   . "${srcdir}/${MOZ_BUILD_APP}/makefiles.sh"
 fi
 
-#
 # Extension makefiles
-#
 for extension in $MOZ_EXTENSIONS; do
   if [ -f "${srcdir}/extensions/${extension}/makefiles.sh" ]; then
     . "${srcdir}/extensions/${extension}/makefiles.sh"
   fi
 done
 
-#
 # Toolkit makefiles
-#
-if test -z "$LIBXUL_SDK"; then
+if [ ! "$LIBXUL_SDK" ]; then
   . "${srcdir}/toolkit/toolkit-makefiles.sh"
 fi
 
 # Services makefiles
 . "${srcdir}/services/makefiles.sh"