Changeset 5077

Timestamp:

07/29/09 17:04:51 (4 months ago)

Author:

chan

Message:

initial modification to enable parallel make for MPE.

Location:

mpich2/trunk/src/mpe2

Files:

• Makefile.in (modified) (6 diffs)
• configure.in (modified) (6 diffs)
• src/callstack/Makefile.in (modified) (3 diffs)
• src/collchk/Makefile.in (modified) (5 diffs)
• src/collchk/src/Makefile.in (modified) (1 diff)
• src/graphics/Makefile.in (modified) (5 diffs)
• src/graphics/src/Makefile.in (modified) (2 diffs)
• src/logging/Makefile.in (modified) (3 diffs)
• src/logging/src/Makefile.in (modified) (6 diffs)
• src/misc/Makefile.in (modified) (3 diffs)
• src/misc/src/Makefile.in (modified) (3 diffs)
• src/slog2sdk/Makefile.in (modified) (5 diffs)
• src/slog2sdk/trace_rlog/Makefile.in (modified) (3 diffs)
• src/slog2sdk/trace_rlog/src/Makefile.in (modified) (1 diff)
• src/wrappers/Makefile.in (modified) (5 diffs)
• src/wrappers/src/Makefile.in (modified) (1 diff)

mpich2/trunk/src/mpe2/Makefile.in

@@ -29 +29 @@
 
 all-redirect: 
-all: build_include build_lib_bin
+all: build_include
+        $(MAKE) $(MAKEOPTS) build_lib_bin
 
 #######  Building from the source
@@ -53 +54 @@
              if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
                  echo ; echo "**** Making $$pkg ...." ; \
-                 ( cd $$pkg && $(MAKE) ) ; \
+                 ( cd $$pkg && $(MAKE) $(MAKEOPTS) ) ; \
                  sleep 1 ; \
              fi ; \
@@ -137 +138 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) clean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) clean ) ; \
               fi ; \
           done
@@ -155 +156 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) distclean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) distclean ) ; \
               fi ; \
           done
@@ -162 +163 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) maintainer-clean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) maintainer-clean ) ; \
               fi ; \
           done
@@ -170 +171 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) owner-clean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) owner-clean ) ; \
               fi ; \
           done

mpich2/trunk/src/mpe2/configure.in

@@ -209 +209 @@
               ;;  # Avoid duplication, do nothing
            *)
-              eval $flagname=\"\$flagvalue -g\"
+              # Split eval command into 2 lines so
+              # vi's hightlight mode won't get confused. 
+              flagcmd="$flagname=\"$flagvalue -g\""
+              eval flagcmd
               ;;
         esac
@@ -297 +300 @@
 MPI_LIBS="$withval" )
 
+dnl
+misc_dirname="src/misc"
+callstack_dirname="src/callstack"
+logging_dirname="src/logging"
+wrappers_dirname="src/wrappers"
+graphics_dirname="src/graphics"
+collchk_dirname="src/collchk"
+slog2_dirname="src/slog2sdk"
+
+dnl Cleanup the subpackages' Makefiles if they exist
+AC_MSG_CHECKING( [for leftover Makefiles in subpackages] )
+leftover_pkgs=""
+for pkg in misc callstack logging wrappers graphics collchk slog2 ; do
+    dirname=${pkg}_dirname
+    eval dirvalue=\$"$dirname"
+    if test -s $rootbuild_dir/$dirvalue/Makefile ; then
+        leftover_pkgs="$leftover_pkgs \"$dirvalue\""
+        ( cd $rootbuild_dir/$dirvalue && $MAKE distclean > /dev/null 2>&1 )
+        dnl Just in case "make distclean" does not remove Makefile.
+        if test -f $rootbuild_dir/$dirvalue/Makefile ; then
+            $RM -f $rootbuild_dir/$dirvalue/Makefile
+        fi
+    fi
+done
+if test "X$leftover_pkgs" = "X" ; then
+    AC_MSG_RESULT( [none] )
+else
+    AC_MSG_RESULT( [$leftover_pkgs cleaned] )
+fi
+
+dnl trial_pkgs="misc callstack logging wrappers graphics collchk"
+
+dnl
+AC_ARG_ENABLE( misc,
+[--enable-misc                      - Build MPE miscellaneous routines, e.g.
+                                     MPE_Errors_xxx(), MPE_Seq_xxx(),
+                                     MPE_xxxTags() and MPE_GetHostName()....
+                                     The default enable=yes.],
+, enable_misc=yes )
+
+dnl
+AC_ARG_ENABLE( callstack,
+[--enable-callstack                 - Build MPE callstack routines, i.e.
+                                     MPE_CallStack_xxx()...
+                                     The default enable=yes.],
+, enable_callstack=yes )
+
+dnl
+AC_ARG_ENABLE( logging,
+[--enable-logging                   - Build MPE logging routines for 
+                                     CLOG-2, e.g.  MPE_Log_xxx()...
+                                     The default enable=yes.],
+, enable_logging=yes )
+
+dnl
+AC_ARG_ENABLE( wrappers,
+[--enable-wrappers                  - Build various MPI wrapper libraries.
+                                     MPI logging library, liblmpe.a;
+                                     MPI tracing library, libtmpe.a;
+                                     MPI Fortran to C library, libmpe_f2cmpi.a],
+, enable_wrappers=yes )
+dnl  src/wrappers requires at least src/logging
+if test "$enable_wrappers" = "yes" ; then
+    if test "$enable_logging" != "yes" ; then
+        enable_logging=yes
+        AC_MSG_WARN( [Enabling Logging which is required by Wrappers.] ); 
+    fi
+fi
+
+dnl  Determine if the X graphics is going to be configured
+AC_ARG_ENABLE( graphics,
+[--enable-graphics                  - Build MPE graphics routines and MPI
+                                     animation library, libampe.a.  If disabled
+                                     then the MPE routines that make use of X11
+                                     graphics will NOT be built.  This is
+                                     appropriate for systems that either do not
+                                     have the X11 include files or that do not
+                                     support X11 graphics.
+                                     The default enable=yes.],
+, enable_graphics=yes )
+dnl  src/graphics's libmpe_nompi.a requires mpehname.c defined in src/misc
+dnl  but then libmpe_nompi.a is rarely used, tests in src/grahics will pass
+dnl  without src/misc.  Let user decides.
+if test "$enable_graphics" = "yes" -a "$enable_misc" != "yes" ; then
+    AC_MSG_WARN( [libmpe_nompi.a in src/graphics needs mpehname.c in src/misc!
+        If you need libmpe_nompi.a, reconfigure with --enable-misc.] )
+fi
+
+AC_ARG_ENABLE( collchk,
+[--enable-collchk                   - Build MPI Collective and Datatype 
+                                     checking library, libmpe_collchk.a],
+, enable_collchk=yes )
+dnl  src/collchk requires at least src/callstack
+if test "$enable_collchk" = "yes" ; then
+    if test "$enable_callstack" != "yes" ; then
+        enable_callstack=yes
+        AC_MSG_WARN( [Enabling CallStack which is required by CollChk.] ); 
+    fi
+fi
+
+selected_pkgs=""
+
+if test "$enable_misc" = "yes" -a -s $srcdir/src/misc/configure ; then
+    selected_pkgs="$selected_pkgs misc"
+    AC_CONFIG_SUBDIRS(src/misc)
+fi
+if test "$enable_callstack" = "yes" -a -s $srcdir/src/callstack/configure ; then
+    selected_pkgs="$selected_pkgs callstack"
+    AC_CONFIG_SUBDIRS(src/callstack)
+fi
+if test "$enable_logging" = "yes" -a -s $srcdir/src/logging/configure ; then
+    selected_pkgs="$selected_pkgs logging"
+    AC_CONFIG_SUBDIRS(src/logging)
+fi
+if test "$enable_wrappers" = "yes" -a -s $srcdir/src/wrappers/configure ; then
+    selected_pkgs="$selected_pkgs wrappers"
+    AC_CONFIG_SUBDIRS(src/wrappers)
+fi
+if test "$enable_graphics" = "yes" -a -s $srcdir/src/graphics/configure ; then
+    selected_pkgs="$selected_pkgs graphics"
+    AC_CONFIG_SUBDIRS(src/graphics)
+fi
+if test "$enable_collchk" = "yes" -a -s $srcdir/src/collchk/configure ; then
+    selected_pkgs="$selected_pkgs collchk"
+    AC_CONFIG_SUBDIRS(src/collchk)
+fi
+
+dnl  Determine if the slog2sdk directory is going to be configured.
+AC_ARG_ENABLE( slog2,
+[--enable-slog2{=build}             - Configure all the SLOG-2 tools.
+                                     --enable-slog2 without any argument will
+                                     use the prebuilt jar files.
+                                     --enable-slog2=build will rebuild all the
+                                     jar files from the source code.
+                                     The default is enable=yes.], ,
+enable_slog2=yes )
+
+
+dnl if SLOG-2 is here, configure it
+if test -s $srcdir/$slog2_dirname/configure ; then
+    if test "$enable_slog2" = "yes" -o "$enable_slog2" = "build" ; then
+        if test "$enable_slog2" = "build" ; then
+            slog2_enable_source=yes
+        else
+            slog2_enable_source=no
+        fi
+        export slog2_enable_source
+        dnl  Enable softerror in SLOG2 configure won't abort the entire process
+        slog2_enable_softerror=yes
+        export slog2_enable_softerror
+        selected_pkgs="$selected_pkgs slog2"
+        if test "$MPI_IMPL" = "MPICH" -o "$MPI_IMPL" = "MPICH2" ; then
+            dnl  Disable the SAMPLE code in slog2sdk for MPICH2
+            slog2_enable_sample=no
+            export slog2_enable_sample
+        fi
+        AC_CONFIG_SUBDIRS(src/slog2sdk)
+    fi
+fi
+
+dnl The following statement is no longer true as of 6/24/2007,
+dnl a thread-specific MPE logging on/off switch has been added
+dnl to mpe_log_thread[.h/.c] and MPI logging wrappper library
+dnl has been updated accordingly.
+dnl
+dnl AC_ARG_ENABLE( threadlogging,
+dnl [--enable-threadlogging             - Turn on/off the coarse-grained thread
+dnl                                      support in MPE logging.  The default
+dnl                                      is enable=no.], ,
+dnl enable_threadlogging=no )
+dnl
+dnl When thread-logging is enabled in multi-thread environment,
+dnl safePMPI guard can't be used, i.e. global variables is_mpelog_on
+dnl can't be used in coarse-grained thread support,
+dnl becasue these varaibles need to be thread-specific.  Otherwise
+dnl turn off logging on 1 thread would mean turning it off for all
+dnl threads.
+dnl
+dnl if test "$enable_threadlogging" = "yes" ; then
+dnl     enable_safePMPI=no
+dnl     export enable_safePMPI
+dnl fi
+
+
 AC_ARG_VAR( MPI_CC, [C compiler for MPI program, e.g. mpixlc_r for BG/P MPI, or mpicc from MPICHx, Open-MPI, or LAM-MPI.  Setting MPI_CC to MPI wrapper means no need to set MPI_INC and MPI_LIBS.] )
 AC_ARG_VAR( MPI_F77, [Fortran compiler for MPI program, e.g. mpixlf77_r for BG/P MPI, or mpif77 from MPICHx, Open-MPI, or LAM-MPI.  Setting MPI_F77 to MPI wrapper means no need to set MPI_INC and MPI_LIBS.] )
@@ -351 +538 @@
 
 
+dnl
+AC_ARG_WITH( config-args,
+[--with-config-args=filename        - Specify configure argument file that
+                                     contains the values of variables that
+                                     configure reads, e.g. CC, CFLAGS, 
+                                     F77, FFLAGS, MPI_CC, MPI_F77....
+                                     If the filename does not begin with
+                                     / (absolute path), . or .. (relative path),
+                                     the filename will be assumed to be
+                                     $top_srcdir/configargs/<filename>.cfg.], ,
+with_config_args=no )
+dnl
+if test "$with_config_args" != "no" ; then
+    case "$with_config_args" in
+        /*|../*|./*)
+            config_args_file="$with_config_args"
+            ;;
+        *)
+            config_args_file="$srcdir/configargs/${with_config_args}.cfg"
+            ;;
+    esac
+    if test -s "$config_args_file" ; then
+        AC_MSG_RESULT([Reading the configure arguments in ${config_args_file}.])
+        . $config_args_file
+        # Export all the variables in $config_args_file
+        # i.e. CC, F77, CFLAGS, FFLAGS and friends...
+        config_args_vars=`grep -v '^#' $config_args_file | sed -e 's/=.*//g'`
+        for var in $config_args_vars ; do
+            eval value=\$"$var"
+            echo "Exporting $var=$value ..."
+            export $var
+        done
+    else
+        AC_MSG_WARN([Non-existent ${config_args_file}.])
+    fi
+fi
+
+
 AC_PROG_CC
 dnl Check for broken handling of common symbols
@@ -488 +713 @@
     PAC_PROG_F77_HAS_INCDIR(f77tmpdir)
     FINC_PATH_LEADER=$F77_INCDIR
+
+    # Replace all -I in MPI_FFLAGS by $FINC_PATH_LEADER
+    MPI_FFLAGS=`echo "$MPI_FFLAGS" | sed -e "s|-I|$FINC_PATH_LEADER|g"`
+    # If there is MPI_FLIBS, to replace -L by $FLIB_PATH_LEADER
 fi
 
@@ -547 +776 @@
 AC_SUBST(MPE_LIBNAME)
 AC_SUBST(MPE_BUILD_FORTRAN2C)
-AC_SUBST(CC)
+dnl "precious" AC_SUBST(CC)
 AC_SUBST(CLINKER)
 AC_SUBST(MPE_CFLAGS)
-AC_SUBST(MPI_CC)
-AC_SUBST(MPI_CFLAGS)
+dnl "precious" AC_SUBST(MPI_CC)
+dnl "precious" AC_SUBST(MPI_CFLAGS)
 AC_SUBST(MPE_CLINKER)
 AC_SUBST(F77)
 AC_SUBST(FLINKER)
 AC_SUBST(MPE_FFLAGS)
-AC_SUBST(MPI_F77)
-AC_SUBST(MPI_FFLAGS)
+dnl "precious" AC_SUBST(MPI_F77)
+dnl "precious" AC_SUBST(MPI_FFLAGS)
 AC_SUBST(MPE_FLINKER)
-AC_SUBST(MPI_LIBS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(MPERUN)
+dnl "precious" AC_SUBST(MPI_LIBS)
+dnl "precious" AC_SUBST(LDFLAGS)
+dnl "precious" AC_SUBST(MPERUN)
 
 dnl  Make the directories that do not contain Makefiles (should they?) but 
@@ -591 +820 @@
 
 
-misc_dirname="src/misc"
-callstack_dirname="src/callstack"
-logging_dirname="src/logging"
-wrappers_dirname="src/wrappers"
-graphics_dirname="src/graphics"
-collchk_dirname="src/collchk"
-slog2_dirname="src/slog2sdk"
-
-dnl Cleanup the subpackages' Makefiles if they exist
-AC_MSG_CHECKING( [for leftover Makefiles in subpackages] )
-leftover_pkgs=""
-for pkg in misc callstack logging wrappers graphics collchk slog2 ; do
-    dirname=${pkg}_dirname
-    eval dirvalue=\$"$dirname"
-    if test -s $rootbuild_dir/$dirvalue/Makefile ; then
-        leftover_pkgs="$leftover_pkgs \"$dirvalue\""
-        ( cd $rootbuild_dir/$dirvalue && $MAKE distclean > /dev/null 2>&1 )
-        dnl Just in case "make distclean" does not remove Makefile.
-        if test -f $rootbuild_dir/$dirvalue/Makefile ; then
-            $RM -f $rootbuild_dir/$dirvalue/Makefile
-        fi
-    fi
-done
-if test "X$leftover_pkgs" = "X" ; then
-    AC_MSG_RESULT( [none] )
-else
-    AC_MSG_RESULT( [$leftover_pkgs cleaned] )
-fi
-
-dnl trial_pkgs="misc callstack logging wrappers graphics collchk"
-
-dnl
-AC_ARG_ENABLE( misc,
-[--enable-misc                      - Build MPE miscellaneous routines, e.g.
-                                     MPE_Errors_xxx(), MPE_Seq_xxx(),
-                                     MPE_xxxTags() and MPE_GetHostName()....
-                                     The default enable=yes.],
-, enable_misc=yes )
-
-dnl
-AC_ARG_ENABLE( callstack,
-[--enable-callstack                 - Build MPE callstack routines, i.e.
-                                     MPE_CallStack_xxx()...
-                                     The default enable=yes.],
-, enable_callstack=yes )
-
-dnl
-AC_ARG_ENABLE( logging,
-[--enable-logging                   - Build MPE logging routines for 
-                                     CLOG-2, e.g.  MPE_Log_xxx()...
-                                     The default enable=yes.],
-, enable_logging=yes )
-
-dnl
-AC_ARG_ENABLE( wrappers,
-[--enable-wrappers                  - Build various MPI wrapper libraries.
-                                     MPI logging library, liblmpe.a;
-                                     MPI tracing library, libtmpe.a;
-                                     MPI Fortran to C library, libmpe_f2cmpi.a],
-, enable_wrappers=yes )
-dnl  src/wrappers requires at least src/logging
-if test "$enable_wrappers" = "yes" ; then
-    if test "$enable_logging" != "yes" ; then
-        enable_logging=yes
-        AC_MSG_WARN( [Enabling Logging which is required by Wrappers.] ); 
-    fi
-fi
-
-dnl  Determine if the X graphics is going to be configured
-AC_ARG_ENABLE( graphics,
-[--enable-graphics                  - Build MPE graphics routines and MPI
-                                     animation library, libampe.a.  If disabled
-                                     then the MPE routines that make use of X11
-                                     graphics will NOT be built.  This is
-                                     appropriate for systems that either do not
-                                     have the X11 include files or that do not
-                                     support X11 graphics.
-                                     The default enable=yes.],
-, enable_graphics=yes )
-dnl  src/graphics's libmpe_nompi.a requires mpehname.c defined in src/misc
-dnl  but then libmpe_nompi.a is rarely used, tests in src/grahics will pass
-dnl  without src/misc.  Let user decides.
-if test "$enable_graphics" = "yes" -a "$enable_misc" != "yes" ; then
-    AC_MSG_WARN( [libmpe_nompi.a in src/graphics needs mpehname.c in src/misc!
-        If you need libmpe_nompi.a, reconfigure with --enable-misc.] )
-fi
-
-AC_ARG_ENABLE( collchk,
-[--enable-collchk                   - Build MPI Collective and Datatype 
-                                     checking library, libmpe_collchk.a],
-, enable_collchk=yes )
-dnl  src/collchk requires at least src/callstack
-if test "$enable_collchk" = "yes" ; then
-    if test "$enable_callstack" != "yes" ; then
-        enable_callstack=yes
-        AC_MSG_WARN( [Enabling CallStack which is required by CollChk.] ); 
-    fi
-fi
-
-selected_pkgs=""
-
-if test "$enable_misc" = "yes" -a -s $srcdir/src/misc/configure ; then
-    selected_pkgs="$selected_pkgs misc"
-    AC_CONFIG_SUBDIRS(src/misc)
-fi
-if test "$enable_callstack" = "yes" -a -s $srcdir/src/callstack/configure ; then
-    selected_pkgs="$selected_pkgs callstack"
-    AC_CONFIG_SUBDIRS(src/callstack)
-fi
-if test "$enable_logging" = "yes" -a -s $srcdir/src/logging/configure ; then
-    selected_pkgs="$selected_pkgs logging"
-    AC_CONFIG_SUBDIRS(src/logging)
-fi
-if test "$enable_wrappers" = "yes" -a -s $srcdir/src/wrappers/configure ; then
-    selected_pkgs="$selected_pkgs wrappers"
-    AC_CONFIG_SUBDIRS(src/wrappers)
-fi
-if test "$enable_graphics" = "yes" -a -s $srcdir/src/graphics/configure ; then
-    selected_pkgs="$selected_pkgs graphics"
-    AC_CONFIG_SUBDIRS(src/graphics)
-fi
-if test "$enable_collchk" = "yes" -a -s $srcdir/src/collchk/configure ; then
-    selected_pkgs="$selected_pkgs collchk"
-    AC_CONFIG_SUBDIRS(src/collchk)
-fi
-
-dnl  Determine if the slog2sdk directory is going to be configured.
-AC_ARG_ENABLE( slog2,
-[--enable-slog2{=build}             - Configure all the SLOG-2 tools.
-                                     --enable-slog2 without any argument will
-                                     use the prebuilt jar files.
-                                     --enable-slog2=build will rebuild all the
-                                     jar files from the source code.
-                                     The default is enable=yes.], ,
-enable_slog2=yes )
-
-
-dnl if SLOG-2 is here, configure it
-if test -s $srcdir/$slog2_dirname/configure ; then
-    if test "$enable_slog2" = "yes" -o "$enable_slog2" = "build" ; then
-        if test "$enable_slog2" = "build" ; then
-            slog2_enable_source=yes
-        else
-            slog2_enable_source=no
-        fi
-        export slog2_enable_source
-        dnl  Enable softerror in SLOG2 configure won't abort the entire process
-        slog2_enable_softerror=yes
-        export slog2_enable_softerror
-        selected_pkgs="$selected_pkgs slog2"
-        if test "$MPI_IMPL" = "MPICH" -o "$MPI_IMPL" = "MPICH2" ; then
-            dnl  Disable the SAMPLE code in slog2sdk for MPICH2
-            slog2_enable_sample=no
-            export slog2_enable_sample
-        fi
-        AC_CONFIG_SUBDIRS(src/slog2sdk)
-    fi
-fi
-
-dnl The following statement is no longer true as of 6/24/2007,
-dnl a thread-specific MPE logging on/off switch has been added
-dnl to mpe_log_thread[.h/.c] and MPI logging wrappper library
-dnl has been updated accordingly.
-dnl
-dnl AC_ARG_ENABLE( threadlogging,
-dnl [--enable-threadlogging             - Turn on/off the coarse-grained thread
-dnl                                      support in MPE logging.  The default
-dnl                                      is enable=no.], ,
-dnl enable_threadlogging=no )
-dnl
-dnl When thread-logging is enabled in multi-thread environment,
-dnl safePMPI guard can't be used, i.e. global variables is_mpelog_on
-dnl can't be used in coarse-grained thread support,
-dnl becasue these varaibles need to be thread-specific.  Otherwise
-dnl turn off logging on 1 thread would mean turning it off for all
-dnl threads.
-dnl
-dnl if test "$enable_threadlogging" = "yes" ; then
-dnl     enable_safePMPI=no
-dnl     export enable_safePMPI
-dnl fi
+
 
 AC_OUTPUT_COMMANDS( [

mpich2/trunk/src/mpe2/src/callstack/Makefile.in

@@ -24 +24 @@
 MPE_HEADERS          = mpe_callstack.h
 
-all: build_include build_lib_bin build_etc
+all: build_include build_etc
+        $(MAKE) $(MAKEOPTS) build_lib_bin
 
 #######  Building from the source
@@ -45 +46 @@
 
 build_lib_bin:
-        @( cd src && $(MAKE) )
+        @( cd src && $(MAKE) $(MAKEOPTS) )
 
 build_etc:
@@ -76 +77 @@
 
 clean: clean_bin clean_lib
-        @( cd src && $(MAKE) clean )
+        @( cd src && $(MAKE) $(MAKEOPTS) clean )
 
 distclean: clean_include clean_bin clean_lib clean_etc
-        @-( cd src && $(MAKE) distclean )
+        @-( cd src && $(MAKE) $(MAKEOPTS) distclean )
         @-$(RM) -f mpe_callstack_conf.h
         @-$(RM) -f Makefile 

mpich2/trunk/src/mpe2/src/collchk/Makefile.in

@@ -24 +24 @@
 MPE_HEADERS          = ""
 
-all: build_include build_lib_bin build_etc linktest_all
+all: build_include build_etc
+        $(MAKE) $(MAKEOPTS) build_lib_bin
+        $(MAKE) $(MAKEOPTS) linktest_all
 
 #######  Building from the source
@@ -41 +43 @@
 
 build_lib_bin:
-        @( cd src && $(MAKE) )
+        @( cd src && $(MAKE) $(MAKEOPTS) )
 
 build_etc:
@@ -49 +51 @@
 
 ########  Linkage Tests
-linktest_all: linktest_C linktest_F77
+linktest_all:
+        $(MAKE) $(MAKEOPTS) linktest_C
+        $(MAKE) $(MAKEOPTS) linktest_F77
 
 linktest_C:
         @if [ "$(MPI_IMPL)" != "MPICH" -a "$(MPI_IMPL)" != "MPICH2" ] ; then \
-             ( cd test && $(MAKE) linktest_C ) ; \
+             ( cd test && $(MAKE) $(MAKEOPTS) linktest_C ) ; \
          fi
 
@@ -60 +64 @@
              if [    "$(MPI_IMPL)" != "MPICH" \
                   -a "$(MPI_IMPL)" != "MPICH2" ] ; then \
-                 ( cd test && $(MAKE) linktest_F77 ) ; \
+                 ( cd test && $(MAKE) $(MAKEOPTS) linktest_F77 ) ; \
              fi ; \
          fi
@@ -81 +85 @@
 
 clean: clean_bin clean_lib
-        @( cd src && $(MAKE) clean )
+        @( cd src && $(MAKE) $(MAKEOPTS) clean )
 
 distclean: clean_include clean_bin clean_lib clean_etc
-        @-( cd src && $(MAKE) distclean )
+        @-( cd src && $(MAKE) $(MAKEOPTS) distclean )
         @-$(RM) -f mpe_collchk_conf.h
         @-$(RM) -f Makefile test/Makefile

mpich2/trunk/src/mpe2/src/collchk/src/Makefile.in

@@ -114 +114 @@
 
 default:
-        $(MAKE) ${libbuild_dir}/lib$(COLLCHK_LIBNAME).a
+        $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(COLLCHK_LIBNAME).a
 
 ${libbuild_dir}/lib$(COLLCHK_LIBNAME).a: $(UTIL_OBJ) $(MPI_CORE_OBJ)
         @if [ "${COLLCHK_BUILD_EXSCAN}" = "yes" ] ; then \
-             $(MAKE) $(MPI_EXSCAN_OBJ) ; \
+             $(MAKE) $(MAKEOPTS) $(MPI_EXSCAN_OBJ) ; \
          fi
         @if [ "${COLLCHK_BUILD_ALLW}" = "yes" ] ; then \
-             $(MAKE) $(MPI_ALLW_OBJ) ; \
+             $(MAKE) $(MAKEOPTS) $(MPI_ALLW_OBJ) ; \
          fi
         @if [ "${COLLCHK_BUILD_IO}" = "yes" ] ; then \
-             $(MAKE) $(MPI_IO_OBJ) ; \
+             $(MAKE) $(MAKEOPTS) $(MPI_IO_OBJ) ; \
          fi
         @if [ "${COLLCHK_BUILD_RMA}" = "yes" ] ; then \
-             $(MAKE) $(MPI_RMA_OBJ) ; \
+             $(MAKE) $(MAKEOPTS) $(MPI_RMA_OBJ) ; \
          fi
         @if [ "${COLLCHK_BUILD_COMMS}" = "yes" ] ; then \
-             $(MAKE) $(MPI_COMM_OBJ) ; \
+             $(MAKE) $(MAKEOPTS) $(MPI_COMM_OBJ) ; \
          fi
         $(AR) $(ARFLAGS) $@ *.@OBJEXT@

mpich2/trunk/src/mpe2/src/graphics/Makefile.in

@@ -25 +25 @@
 
 # Assumption: This Makefile won't be created if X is not available
-all: build_include build_lib_bin build_etc linktest_all
+all: build_include build_etc
+        $(MAKE) $(MAKEOPTS) build_lib_bin
+        $(MAKE) $(MAKEOPTS) linktest_all
 
 #######  Building from the source
@@ -42 +44 @@
 
 build_lib_bin:
-        @( cd src && $(MAKE) )
+        @( cd src && $(MAKE) $(MAKEOPTS) )
 
 build_etc:
@@ -50 +52 @@
 
 ########  Linkage Tests
-linktest_all: linktest_C linktest_F77
+linktest_all:
+        $(MAKE) $(MAKEOPTS) linktest_C
+        $(MAKE) $(MAKEOPTS) linktest_F77
 
 linktest_C:
         @if [    "$(MPI_IMPL)" != "MPICH" \
               -a "$(MPI_IMPL)" != "MPICH2" ] ; then \
-             ( cd contrib/test && $(MAKE) linktest_C ) ; \
+             ( cd contrib/test && $(MAKE) $(MAKEOPTS) linktest_C ) ; \
          fi
 
@@ -62 +66 @@
              if [    "$(MPI_IMPL)" != "MPICH" \
                   -a "$(MPI_IMPL)" != "MPICH2" ] ; then \
-                 ( cd contrib/test && $(MAKE) linktest_F77 ) ; \
+                 ( cd contrib/test && $(MAKE) $(MAKEOPTS) linktest_F77 ) ; \
              fi ; \
          fi
@@ -83 +87 @@
 
 clean: clean_bin clean_lib
-        @( cd src && $(MAKE) clean )
+        @( cd src && $(MAKE) $(MAKEOPTS) clean )
 
 distclean: clean_include clean_bin clean_lib clean_etc
-        @-( cd src && $(MAKE) distclean )
+        @-( cd src && $(MAKE) $(MAKEOPTS) distclean )
         @-$(RM) -f mpe_graphics_conf.h
         @-$(RM) -f Makefile contrib/*/Makefile

mpich2/trunk/src/mpe2/src/graphics/src/Makefile.in

@@ -100 +100 @@
 #
 default:
-         $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a 
-         $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME).a 
-         $(MAKE) ${libbuild_dir}/lib$(ANIM_LIBNAME).a
+         $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a 
+         $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME).a 
+         $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(ANIM_LIBNAME).a
 
 #
@@ -119 +119 @@
         $(AR) $(ARFLAGS) $@ $(MPE_P_COBJECTS)
         @if [ "$(MPE_BUILD_FORTRAN2C)" = "yes" ] ; then \
-             $(MAKE) $(MPE_P_WOBJECTS) ; \
+             $(MAKE) $(MAKEOPTS) $(MPE_P_WOBJECTS) ; \
              $(AR) $(ARFLAGS) $@ $(MPE_P_WOBJECTS) ; \
          fi

mpich2/trunk/src/mpe2/src/logging/Makefile.in

@@ -25 +25 @@
                        mpe_log_thread.h mpe_log.h mpe_logf.h
 
-all: build_include build_lib_bin build_etc
+all: build_include build_etc
+        $(MAKE) $(MAKEOPTS) build_lib_bin
 
 #######  Building from the source
@@ -46 +47 @@
 
 build_lib_bin:
-        @( cd src && $(MAKE) )
+        @( cd src && $(MAKE) $(MAKEOPTS) )
 
 build_etc:
@@ -77 +78 @@
 
 clean: clean_bin clean_lib
-        @( cd src && $(MAKE) clean )
+        @( cd src && $(MAKE) $(MAKEOPTS) clean )
 
 distclean: clean_include clean_bin clean_lib clean_etc
-        @-( cd src && $(MAKE) distclean )
+        @-( cd src && $(MAKE) $(MAKEOPTS) distclean )
         @-$(RM) -f mpe_logging_conf.h
         @-$(RM) -f Makefile 

mpich2/trunk/src/mpe2/src/logging/src/Makefile.in

@@ -108 +108 @@
 #
 default:
-        $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a
-        $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi_null.a
-        $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME)_null.a
-        $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME).a
-        $(MAKE) $(EXECS)
+        $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a
+        $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi_null.a
+        $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME)_null.a
+        $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME).a
+        $(MAKE) $(MAKEOPTS) $(EXECS)
 
 #
@@ -129 +129 @@
         $(AR) $(ARFLAGS) $@ $(MPE_P_COBJECTS)
         @if [ "$(MPE_BUILD_FORTRAN2C)" = "yes" ] ; then \
-             $(MAKE) $(MPE_P_WOBJECTS) ; \
+             $(MAKE) $(MAKEOPTS) $(MPE_P_WOBJECTS) ; \
              $(AR) $(ARFLAGS) $@ $(MPE_P_WOBJECTS) ; \
          fi
@@ -137 +137 @@
         $(AR) $(ARFLAGS) $@ $(MPE_N_ZOBJECTS) $(MPE_N_COBJECTS)
         @if [ "$(MPE_BUILD_FORTRAN2C)" = "yes" ] ; then \
-             $(MAKE) $(MPE_N_WOBJECTS) ; \
+             $(MAKE) $(MAKEOPTS) $(MPE_N_WOBJECTS) ; \
              $(AR) $(ARFLAGS) $@ $(MPE_N_WOBJECTS) ; \
          fi
@@ -146 +146 @@
         $(AR) $(ARFLAGS) $@ $(MPE_P_XOBJECTS)
         @if [ "$(MPE_BUILD_FORTRAN2C)" = "yes" ] ; then \
-             $(MAKE) $(MPE_P_WOBJECTS) ; \
+             $(MAKE) $(MAKEOPTS) $(MPE_P_WOBJECTS) ; \
              $(AR) $(ARFLAGS) $@ $(MPE_P_WOBJECTS) ; \
          fi
@@ -155 +155 @@
         $(AR) $(ARFLAGS) $@ $(MPE_N_ZOBJECTS) $(MPE_N_XOBJECTS)
         @if [ "$(MPE_BUILD_FORTRAN2C)" = "yes" ] ; then \
-             $(MAKE) $(MPE_N_WOBJECTS) ; \
+             $(MAKE) $(MAKEOPTS) $(MPE_N_WOBJECTS) ; \
              $(AR) $(ARFLAGS) $@ $(MPE_N_WOBJECTS) ; \
          fi
@@ -163 +163 @@
 # as NEC SX-8's cross-compiler refuses to link with *.no
 ${binbuild_dir}/clog2_print@EXEEXT@: clog_print.n@OBJEXT@
-        $(CP) -f clog_print.n@OBJEXT@ mpe2tmp.@OBJEXT@
-        $(CLINKER) $(CC_LDFLAGS) -o $@ mpe2tmp.@OBJEXT@ \
+        $(CP) -f clog_print.n@OBJEXT@ mpe2tmp1.@OBJEXT@
+        $(CLINKER) $(CC_LDFLAGS) -o $@ mpe2tmp1.@OBJEXT@ \
                                  -L${libbuild_dir} -l$(PROF_LIBNAME)_nompi
-        @-$(RM) -f mpe2tmp.@OBJEXT@
+        @-$(RM) -f mpe2tmp1.@OBJEXT@
 
 ${binbuild_dir}/clog2_join@EXEEXT@: clog_join.n@OBJEXT@
-        $(CP) -f clog_join.n@OBJEXT@ mpe2tmp.@OBJEXT@
-        $(CLINKER) $(CC_LDFLAGS) -o $@ mpe2tmp.@OBJEXT@ \
+        $(CP) -f clog_join.n@OBJEXT@ mpe2tmp2.@OBJEXT@
+        $(CLINKER) $(CC_LDFLAGS) -o $@ mpe2tmp2.@OBJEXT@ \
                                  -L${libbuild_dir} -l$(PROF_LIBNAME)_nompi
-        @-$(RM) -f mpe2tmp.@OBJEXT@
+        @-$(RM) -f mpe2tmp2.@OBJEXT@
 
 ${binbuild_dir}/clog2_repair@EXEEXT@: clog_repair.n@OBJEXT@
-        $(CP) -f clog_repair.n@OBJEXT@ mpe2tmp.@OBJEXT@
-        $(CLINKER) $(CC_LDFLAGS) -o $@ mpe2tmp.@OBJEXT@ \
+        $(CP) -f clog_repair.n@OBJEXT@ mpe2tmp3.@OBJEXT@
+        $(CLINKER) $(CC_LDFLAGS) -o $@ mpe2tmp3.@OBJEXT@ \
                                  -L${libbuild_dir} -l$(PROF_LIBNAME)_nompi
-        @-$(RM) -f mpe2tmp.@OBJEXT@
+        @-$(RM) -f mpe2tmp3.@OBJEXT@
 
 #

mpich2/trunk/src/mpe2/src/misc/Makefile.in

@@ -23 +23 @@
 MPE_HEADERS          = mpe_misc.h
 
-all: build_include build_lib_bin
+all: build_include
+        $(MAKE) $(MAKEOPTS) build_lib_bin
 
 #######  Building from the source
@@ -40 +41 @@
 
 build_lib_bin:
-        @( cd src && $(MAKE) )
+        @( cd src && $(MAKE) $(MAKEOPTS) )
 
 ########  Linkage Tests
@@ -62 +63 @@
 
 clean: clean_bin clean_lib
-        @( cd src && $(MAKE) clean )
+        @( cd src && $(MAKE) $(MAKEOPTS) clean )
 
 distclean: clean_include clean_bin clean_lib
-        @-( cd src && $(MAKE) distclean )
+        @-( cd src && $(MAKE) $(MAKEOPTS) distclean )
         @-$(RM) -f mpe_misc_conf.h
         @-$(RM) -f Makefile

mpich2/trunk/src/mpe2/src/misc/src/Makefile.in

@@ -100 +100 @@
 #
 default:
-        $(MAKE) mpe_debug_objs 
-        $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a
-        $(MAKE) ${libbuild_dir}/lib$(PROF_LIBNAME).a
+        $(MAKE) $(MAKEOPTS) mpe_debug_objs 
+        $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME)_nompi.a
+        $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(PROF_LIBNAME).a
 
 #
@@ -109 +109 @@
         @-if [ "$(MPEDBG)" = "yes" -a "$(MPI_IMPL)" = "MPICH" ] ; then \
             echo "Making MPICH's mpedbg" ;  \
-            ( cd ../../../../src/env ; $(MAKE) mpe_debug_objs ) ; \
+            ( cd ../../../../src/env ; $(MAKE) $(MAKEOPTS) mpe_debug_objs ) ; \
         fi
 
@@ -127 +127 @@
         $(AR) $(ARFLAGS) $@ $(MPE_P_COBJECTS)
         @if [ "$(MPE_BUILD_FORTRAN2C)" = "yes" ] ; then \
-             $(MAKE) ${MPE_P_WOBJECTS} ; \
+             $(MAKE) $(MAKEOPTS) ${MPE_P_WOBJECTS} ; \
              $(AR) $(ARFLAGS) $@ ${MPE_P_WOBJECTS} ; \
          fi

mpich2/trunk/src/mpe2/src/slog2sdk/Makefile.in

@@ -11 +11 @@
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
                   echo "Making $$pkg" ; \
-                  ( cd $$pkg && $(MAKE) ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) ) ; \
               fi ; \
           done
@@ -28 +28 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) clean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) clean ) ; \
               fi ; \
           done
@@ -50 +50 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) distclean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) distclean ) ; \
               fi ; \
           done
@@ -57 +57 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) maintainer-clean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) maintainer-clean ) ; \
               fi ; \
           done
@@ -64 +64 @@
         @-for pkg in $(PKGS) ; do \
               if [ -n "$$pkg" -a -s $$pkg/Makefile ] ; then \
-                  ( cd $$pkg && $(MAKE) owner-clean ) ; \
+                  ( cd $$pkg && $(MAKE) $(MAKEOPTS) owner-clean ) ; \
               fi ; \
           done

mpich2/trunk/src/mpe2/src/slog2sdk/trace_rlog/Makefile.in

@@ -5 +5 @@
 
 all:    
-        cd src && $(MAKE)
+        cd src && $(MAKE) $(MAKEOPTS)
 
 install:
@@ -18 +18 @@
 
 clean:
-        -cd src && $(MAKE) clean
+        -cd src && $(MAKE) $(MAKEOPTS) clean
 
 rmprog:
@@ -29 +29 @@
 
 distclean: rmprog
-        @-cd src && $(MAKE) distclean
+        @-cd src && $(MAKE) $(MAKEOPTS) distclean
         @-$(RM) sbin/install-package
         @-$(RM) Makefile libtool

mpich2/trunk/src/mpe2/src/slog2sdk/trace_rlog/src/Makefile.in

@@ -64 +64 @@
         $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
 
-ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$(PGM_CHECK)
+ALL: $(libbuild_dir)/$(LIB_TRACE)
+        $(MAKE) $(MAKEOPTS) $(binbuild_dir)/$(PGM_PRINT)
+        $(MAKE) $(MAKEOPTS) $(binbuild_dir)/$(PGM_CHECK)
 
 $(libbuild_dir)/$(LIB_TRACE): $(LOBJ)

mpich2/trunk/src/mpe2/src/wrappers/Makefile.in

@@ -24 +24 @@
 MPE_HEADERS          = ""
 
-all: build_include build_lib_bin build_etc linktest_all
+all: build_include build_etc
+        $(MAKE) $(MAKEOPTS) build_lib_bin
+        $(MAKE) $(MAKEOPTS) linktest_all
 
 #######  Building from the source
@@ -45 +47 @@
 
 build_lib_bin:
-        @( cd src && $(MAKE) )
+        @( cd src && $(MAKE) $(MAKEOPTS) )
 
 build_etc:
@@ -53 +55 @@
 
 ########  Linkage Tests
-linktest_all: linktest_C linktest_F77
+linktest_all:
+        $(MAKE) $(MAKEOPTS) linktest_C
+        $(MAKE) $(MAKEOPTS) linktest_F77
 
 linktest_C:
         @if [ "$(MPI_IMPL)" != "MPICH" -a "$(MPI_IMPL)" != "MPICH2" ] ; then \
-             ( cd test && $(MAKE) linktest_C ) ; \
+             ( cd test && $(MAKE) $(MAKEOPTS) linktest_C ) ; \
          fi
 
@@ -64 +68 @@
              if [    "$(MPI_IMPL)" != "MPICH" \
                   -a "$(MPI_IMPL)" != "MPICH2" ] ; then \
-                 ( cd test && $(MAKE) linktest_F77 ) ; \
+                 ( cd test && $(MAKE) $(MAKEOPTS) linktest_F77 ) ; \
              fi ; \
          fi
@@ -85 +89 @@
 
 clean: clean_bin clean_lib
-        @( cd src && $(MAKE) clean )
+        @( cd src && $(MAKE) $(MAKEOPTS) clean )
 
 distclean: clean_include clean_bin clean_lib clean_etc
-        @-( cd src && $(MAKE) distclean )
+        @-( cd src && $(MAKE) $(MAKEOPTS) distclean )
         @-$(RM) -f mpe_wrappers_conf.h
         @-$(RM) -f Makefile test/Makefile

mpich2/trunk/src/mpe2/src/wrappers/src/Makefile.in

@@ -100 +100 @@
 # is needed and all the pre-requisites of libmpe_f2cmpi.a are met.
 default:
-         $(MAKE) ${libbuild_dir}/lib$(LOG_LIBNAME).a
-         $(MAKE) ${libbuild_dir}/lib$(TRACE_LIBNAME).a
+         $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(LOG_LIBNAME).a
+         $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(TRACE_LIBNAME).a
         @if [    "$(MPE_BUILD_FORTRAN2C)" = "yes" \
               -a "${F2CMPI_LIBS}" = "-l${F2CMPI_LIBNAME}" ] ; then \
-             $(MAKE) ${libbuild_dir}/lib$(F2CMPI_LIBNAME).a ; \
+             $(MAKE) $(MAKEOPTS) ${libbuild_dir}/lib$(F2CMPI_LIBNAME).a ; \
          fi
-         $(MAKE) ${libbuild_dir}/mpe_prof.@OBJEXT@
+         $(MAKE) $(MAKEOPTS) ${libbuild_dir}/mpe_prof.@OBJEXT@
 
 #