Index: /mpich2/branches/dev/kumudb/src/pm/Makefile.sm
===================================================================
--- /mpich2/branches/dev/kumudb/src/pm/Makefile.sm (revision 4870)
+++ /mpich2/branches/dev/kumudb/src/pm/Makefile.sm (revision 4899)
@@ -12,5 +12,5 @@
 # We need to handle the case where the process manager is external to 
 # MPICH2
-all-postamble:
+executable-postamble:
 	if [ -n "@pm_name@" -a -d "@pm_name@" ] ; then \
 	build_prefix=`cd ../.. && pwd` && cd @pm_name@ && \
Index: /mpich2/branches/dev/kumudb/src/pm/remshell/Makefile.sm
===================================================================
--- /mpich2/branches/dev/kumudb/src/pm/remshell/Makefile.sm (revision 3488)
+++ /mpich2/branches/dev/kumudb/src/pm/remshell/Makefile.sm (revision 4899)
@@ -1,4 +1,4 @@
 mpiexec_SOURCES = mpiexec.c 
-mpiexec_LDADD = -L../util -lmpiexec -L../../../lib -L${master_top_srcdir}/lib -lmpich
+mpiexec_LDADD = -L${master_top_srcdir}/lib -lmpiexec -L../../../lib -L${master_top_srcdir}/lib -lmpich
 INCLUDES = -I../../include -I${master_top_srcdir}/src/include \
     -I../../pmi/simple -I${master_top_srcdir}/src/pmi/simple \
@@ -33,5 +33,7 @@
 # We use a dummy dependency to ensure that we always go to the util
 # directory to see if anything needs to be done	
-../util/libmpiexec.a: dummy
-dummy:
+#../util/libmpiexec.a: dummy
+#dummy:
 	cd ../util && $(MAKE)
+all-local:
+	cd ../util && $(MAKE)
Index: /mpich2/branches/dev/kumudb/maint/simplemake.in
===================================================================
--- /mpich2/branches/dev/kumudb/maint/simplemake.in (revision 4898)
+++ /mpich2/branches/dev/kumudb/maint/simplemake.in (revision 4899)
@@ -3397,15 +3397,17 @@
 }
 
-
+#-------------------Kumud_parallel_fix-----------------------------
 # Generate the target all-executable-local
 sub TargetProgramsLocal {
-    print FD "all-executable-local:";
-    foreach $pgm (keys (%programs)) {
-        if (defined($extra_programs{$pgm})) { next; }
-        if (defined($extra_libs{$pgm})) { next; }
-        print FD " $pgm";
-    }
-    print FD "$newline";
-}
+    if (!defined($usertargets{"all-executable-local"})) { 
+        print FD "all-executable-local:";
+        foreach $pgm (keys (%programs)) {
+            if (defined($extra_programs{$pgm})) { next; }
+            if (defined($extra_libs{$pgm})) { next; }
+            print FD " $pgm";
+        }
+        print FD "$newline";
+    }
+} 
 
 
@@ -4168,7 +4170,5 @@
 	}
     }
-    
-
-   
+    &TargetPostamble( "executable" );   
 }
 
Index: /mpich2/branches/dev/kumudb/examples/Makefile.sm
===================================================================
--- /mpich2/branches/dev/kumudb/examples/Makefile.sm (revision 4811)
+++ /mpich2/branches/dev/kumudb/examples/Makefile.sm (revision 4899)
@@ -1,50 +1,50 @@
-#smvarSubdir_do_dependencies=no
-#smvar_dependenciesDummy=yes
-##OTHER_DIRS = f77 f90 cxx
-## We want to replace the compilation and linking rule used by simplement
-#MPICHDIR=..
-#CC       = $(MPICHDIR)/bin/mpicc
-#CFLAGS   =
-#CXXFLAGS =
-#FFLAGS   =
-#F90FLAGS =
-#LDFLAGS  =
-#CPPFLAGS = 
-#DEFS     = 
-#INCLUDES = -I../src/include -I${top_srcdir}/src/include
-#
-#LDADD  = 
-#DEPADD = ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-#LIBS   =
-## pmandel requires a separate set of socket calls (its a long story)
-## and may not build on most platforms
-#EXTRA_PROGRAMS = pmandel pmandel_spawn pmandel_service pmandel_spaserv \
-#	         pmandel_fence hellow icpi parent child srtest srvec sr \
-#		 spawn_merge_parent spawn_merge_child1 spawn_merge_child2
-#
-## LIBS includes -lmpich and other libraries (e.g., -lpmpich if
-## weak symbols are not supported)
-#hellow_SOURCES = hellow.c
-#srtest_SOURCES = srtest.c
-#child_SOURCES = child.c
-#parent_SOURCES = parent.c
-#cpi_SOURCES = cpi.c
-#cpi_LDADD = -lm
-#icpi_SOURCES = icpi.c
-#icpi_LDADD = -lm
-#pmandel_SOURCES = pmandel.c
-#pmandel_LDADD = -lm
-#pmandel_spawn_SOURCES = pmandel_spawn.c
-#pmandel_spawn_LDADD = -lm
-#pmandel_service_SOURCES = pmandel_service.c
-#pmandel_service_LDADD = -lm
-#pmandel_spaserv_SOURCES = pmandel_spaserv.c
-#pmandel_spaserv_LDADD = -lm
-#pmandel_fence_SOURCES = pmandel_fence.c
-#pmandel_fence_LDADD = -lm
-#spawn_merge_parent_SOURCES = spawn_merge_parent.c
-#spawn_merge_child1_SOURCES = spawn_merge_child1.c
-#spawn_merge_child2_SOURCES = spawn_merge_child2.c
-#
-## Use make all-programs to test building all example programs
-#all-programs: cpi $(EXTRA_PROGRAMS) 
+smvarSubdir_do_dependencies=no
+smvar_dependenciesDummy=yes
+#OTHER_DIRS = f77 f90 cxx
+# We want to replace the compilation and linking rule used by simplement
+MPICHDIR=..
+CC       = $(MPICHDIR)/bin/mpicc
+CFLAGS   =
+CXXFLAGS =
+FFLAGS   =
+F90FLAGS =
+LDFLAGS  =
+CPPFLAGS = 
+DEFS     = 
+INCLUDES = -I../src/include -I${top_srcdir}/src/include
+
+LDADD  = 
+DEPADD = ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
+LIBS   =
+# pmandel requires a separate set of socket calls (its a long story)
+# and may not build on most platforms
+EXTRA_PROGRAMS = pmandel pmandel_spawn pmandel_service pmandel_spaserv \
+	         pmandel_fence hellow icpi parent child srtest srvec sr \
+		 spawn_merge_parent spawn_merge_child1 spawn_merge_child2
+
+# LIBS includes -lmpich and other libraries (e.g., -lpmpich if
+# weak symbols are not supported)
+hellow_SOURCES = hellow.c
+srtest_SOURCES = srtest.c
+child_SOURCES = child.c
+parent_SOURCES = parent.c
+cpi_SOURCES = cpi.c
+cpi_LDADD = -lm
+icpi_SOURCES = icpi.c
+icpi_LDADD = -lm
+pmandel_SOURCES = pmandel.c
+pmandel_LDADD = -lm
+pmandel_spawn_SOURCES = pmandel_spawn.c
+pmandel_spawn_LDADD = -lm
+pmandel_service_SOURCES = pmandel_service.c
+pmandel_service_LDADD = -lm
+pmandel_spaserv_SOURCES = pmandel_spaserv.c
+pmandel_spaserv_LDADD = -lm
+pmandel_fence_SOURCES = pmandel_fence.c
+pmandel_fence_LDADD = -lm
+spawn_merge_parent_SOURCES = spawn_merge_parent.c
+spawn_merge_child1_SOURCES = spawn_merge_child1.c
+spawn_merge_child2_SOURCES = spawn_merge_child2.c
+
+# Use make all-programs to test building all example programs
+all-programs: cpi $(EXTRA_PROGRAMS)