Bug 707593 - Clean up makefile generation in js/src configure; r=ted
authorEd Morley <bmo@edmorley.co.uk>
Thu, 08 Dec 2011 20:02:25 +0000
changeset 82310 19d325115037
parent 82309 c19c975a825a
child 82311 758a0ae33484
push id21591
push userbmo@edmorley.co.uk
push date2011-12-09 11:33 +0000
treeherdermozilla-central@63bff373cb94 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs707593
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 707593 - Clean up makefile generation in js/src configure; r=ted * Adds the omitted js/src/analysis-tests/Makefile * Adds conditionals to prevent makefiles being generated where they won't be used
js/src/configure.in
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -5324,28 +5324,44 @@ AC_OUTPUT_MAKE_DEFS()
 MOZ_DEFINES=$DEFS
 AC_SUBST(MOZ_DEFINES)
 rm -f confdefs.h
 mv confdefs.h.save confdefs.h
 
 MAKEFILES="
   Makefile
   shell/Makefile
-  jsapi-tests/Makefile
-  tests/Makefile
   config/Makefile
   config/autoconf.mk
   config/expandlibs_config.py
-  config/mkdepend/Makefile
 "
 
-if test -n "$JS_NATIVE_EDITLINE"; then
-   MAKEFILES="$MAKEFILES
-editline/Makefile
-"
+if test "$JS_NATIVE_EDITLINE"; then
+  MAKEFILES="$MAKEFILES
+    editline/Makefile
+  "
+fi
+
+if test ! "$COMPILER_DEPEND" -a ! "$MOZ_NATIVE_MAKEDEPEND"; then
+  MAKEFILES="$MAKEFILES
+    config/mkdepend/Makefile
+  "
+fi
+
+if test "$ENABLE_TESTS"; then
+  MAKEFILES="$MAKEFILES
+    jsapi-tests/Makefile
+    tests/Makefile
+  "
+fi
+
+if test "$DEHYDRA_PATH"; then
+  MAKEFILES="$MAKEFILES
+    analysis-tests/Makefile
+  "
 fi
 
 dnl
 dnl Run a perl script to quickly create the makefiles.
 dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
 dnl   for the files it cannot handle correctly. This way, config.status
 dnl   will handle these files.
 dnl If it fails, nothing is set and config.status will run as usual.