Changeset 4899

Show
Ignore:
Timestamp:
07/03/09 14:23:23 (5 months ago)
Author:
kumudb
Message:

all executable works including cpi in examples and mpiexec in pm

Location:
mpich2/branches/dev/kumudb
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • mpich2/branches/dev/kumudb/examples/Makefile.sm

    r4811 r4899  
    1 #smvarSubdir_do_dependencies=no 
    2 #smvar_dependenciesDummy=yes 
    3 ##OTHER_DIRS = f77 f90 cxx 
    4 ## We want to replace the compilation and linking rule used by simplement 
    5 #MPICHDIR=.. 
    6 #CC       = $(MPICHDIR)/bin/mpicc 
    7 #CFLAGS   = 
    8 #CXXFLAGS = 
    9 #FFLAGS   = 
    10 #F90FLAGS = 
    11 #LDFLAGS  = 
    12 #CPPFLAGS =  
    13 #DEFS     =  
    14 #INCLUDES = -I../src/include -I${top_srcdir}/src/include 
    15 # 
    16 #LDADD  =  
    17 #DEPADD = ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a 
    18 #LIBS   = 
    19 ## pmandel requires a separate set of socket calls (its a long story) 
    20 ## and may not build on most platforms 
    21 #EXTRA_PROGRAMS = pmandel pmandel_spawn pmandel_service pmandel_spaserv \ 
    22 #                pmandel_fence hellow icpi parent child srtest srvec sr \ 
    23 #                spawn_merge_parent spawn_merge_child1 spawn_merge_child2 
    24 # 
    25 ## LIBS includes -lmpich and other libraries (e.g., -lpmpich if 
    26 ## weak symbols are not supported) 
    27 #hellow_SOURCES = hellow.c 
    28 #srtest_SOURCES = srtest.c 
    29 #child_SOURCES = child.c 
    30 #parent_SOURCES = parent.c 
    31 #cpi_SOURCES = cpi.c 
    32 #cpi_LDADD = -lm 
    33 #icpi_SOURCES = icpi.c 
    34 #icpi_LDADD = -lm 
    35 #pmandel_SOURCES = pmandel.c 
    36 #pmandel_LDADD = -lm 
    37 #pmandel_spawn_SOURCES = pmandel_spawn.c 
    38 #pmandel_spawn_LDADD = -lm 
    39 #pmandel_service_SOURCES = pmandel_service.c 
    40 #pmandel_service_LDADD = -lm 
    41 #pmandel_spaserv_SOURCES = pmandel_spaserv.c 
    42 #pmandel_spaserv_LDADD = -lm 
    43 #pmandel_fence_SOURCES = pmandel_fence.c 
    44 #pmandel_fence_LDADD = -lm 
    45 #spawn_merge_parent_SOURCES = spawn_merge_parent.c 
    46 #spawn_merge_child1_SOURCES = spawn_merge_child1.c 
    47 #spawn_merge_child2_SOURCES = spawn_merge_child2.c 
    48 # 
    49 ## Use make all-programs to test building all example programs 
    50 #all-programs: cpi $(EXTRA_PROGRAMS)  
     1smvarSubdir_do_dependencies=no 
     2smvar_dependenciesDummy=yes 
     3#OTHER_DIRS = f77 f90 cxx 
     4# We want to replace the compilation and linking rule used by simplement 
     5MPICHDIR=.. 
     6CC       = $(MPICHDIR)/bin/mpicc 
     7CFLAGS   = 
     8CXXFLAGS = 
     9FFLAGS   = 
     10F90FLAGS = 
     11LDFLAGS  = 
     12CPPFLAGS =  
     13DEFS     =  
     14INCLUDES = -I../src/include -I${top_srcdir}/src/include 
     15 
     16LDADD  =  
     17DEPADD = ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a 
     18LIBS   = 
     19# pmandel requires a separate set of socket calls (its a long story) 
     20# and may not build on most platforms 
     21EXTRA_PROGRAMS = pmandel pmandel_spawn pmandel_service pmandel_spaserv \ 
     22                 pmandel_fence hellow icpi parent child srtest srvec sr \ 
     23                 spawn_merge_parent spawn_merge_child1 spawn_merge_child2 
     24 
     25# LIBS includes -lmpich and other libraries (e.g., -lpmpich if 
     26# weak symbols are not supported) 
     27hellow_SOURCES = hellow.c 
     28srtest_SOURCES = srtest.c 
     29child_SOURCES = child.c 
     30parent_SOURCES = parent.c 
     31cpi_SOURCES = cpi.c 
     32cpi_LDADD = -lm 
     33icpi_SOURCES = icpi.c 
     34icpi_LDADD = -lm 
     35pmandel_SOURCES = pmandel.c 
     36pmandel_LDADD = -lm 
     37pmandel_spawn_SOURCES = pmandel_spawn.c 
     38pmandel_spawn_LDADD = -lm 
     39pmandel_service_SOURCES = pmandel_service.c 
     40pmandel_service_LDADD = -lm 
     41pmandel_spaserv_SOURCES = pmandel_spaserv.c 
     42pmandel_spaserv_LDADD = -lm 
     43pmandel_fence_SOURCES = pmandel_fence.c 
     44pmandel_fence_LDADD = -lm 
     45spawn_merge_parent_SOURCES = spawn_merge_parent.c 
     46spawn_merge_child1_SOURCES = spawn_merge_child1.c 
     47spawn_merge_child2_SOURCES = spawn_merge_child2.c 
     48 
     49# Use make all-programs to test building all example programs 
     50all-programs: cpi $(EXTRA_PROGRAMS)  

  • mpich2/branches/dev/kumudb/maint/simplemake.in

    r4898 r4899  
    33973397} 
    33983398 
    3399  
     3399#-------------------Kumud_parallel_fix----------------------------- 
    34003400# Generate the target all-executable-local 
    34013401sub TargetProgramsLocal { 
    3402     print FD "all-executable-local:"; 
    3403     foreach $pgm (keys (%programs)) { 
    3404         if (defined($extra_programs{$pgm})) { next; } 
    3405         if (defined($extra_libs{$pgm})) { next; } 
    3406         print FD " $pgm"; 
    3407     } 
    3408     print FD "$newline"; 
    3409 } 
     3402    if (!defined($usertargets{"all-executable-local"})) {  
     3403        print FD "all-executable-local:"; 
     3404        foreach $pgm (keys (%programs)) { 
     3405            if (defined($extra_programs{$pgm})) { next; } 
     3406            if (defined($extra_libs{$pgm})) { next; } 
     3407            print FD " $pgm"; 
     3408        } 
     3409        print FD "$newline"; 
     3410    } 
     3411}  
    34103412 
    34113413 
    … …  
    41684170        } 
    41694171    } 
    4170      
    4171  
    4172     
     4172    &TargetPostamble( "executable" );    
    41734173} 
    41744174 

  • mpich2/branches/dev/kumudb/src/pm/Makefile.sm

    r4870 r4899  
    1212# We need to handle the case where the process manager is external to  
    1313# MPICH2 
    14 all-postamble: 
     14executable-postamble: 
    1515        if [ -n "@pm_name@" -a -d "@pm_name@" ] ; then \ 
    1616        build_prefix=`cd ../.. && pwd` && cd @pm_name@ && \ 

  • mpich2/branches/dev/kumudb/src/pm/remshell/Makefile.sm

    r3488 r4899  
    11mpiexec_SOURCES = mpiexec.c  
    2 mpiexec_LDADD = -L../util -lmpiexec -L../../../lib -L${master_top_srcdir}/lib -lmpich 
     2mpiexec_LDADD = -L${master_top_srcdir}/lib -lmpiexec -L../../../lib -L${master_top_srcdir}/lib -lmpich 
    33INCLUDES = -I../../include -I${master_top_srcdir}/src/include \ 
    44    -I../../pmi/simple -I${master_top_srcdir}/src/pmi/simple \ 
    … …  
    3333# We use a dummy dependency to ensure that we always go to the util 
    3434# directory to see if anything needs to be done  
    35 ../util/libmpiexec.a: dummy 
    36 dummy: 
     35#../util/libmpiexec.a: dummy 
     36#dummy: 
    3737        cd ../util && $(MAKE) 
     38all-local: 
     39        cd ../util && $(MAKE)