Removed ROMIO from automatic build target. Now we need to add build
authorChao Huang <chuang10@uiuc.edu>
Mon, 21 Jun 2004 20:00:05 +0000 (20:00 +0000)
committerChao Huang <chuang10@uiuc.edu>
Mon, 21 Jun 2004 20:00:05 +0000 (20:00 +0000)
option "--with-romio" to build ROMIO with AMPI.

build
src/libs/ck-libs/ampi/Makefile
src/libs/ck-libs/ampi/ampi.C
src/scripts/configure.in

diff --git a/build b/build
index d43a19726e634288e5a85439ca5bb9223644b106..3437138dcfec61f8dd0f51c36746ca1c9b369af1 100755 (executable)
--- a/build
+++ b/build
@@ -70,6 +70,7 @@ syntax() {
   echo '  --libdir=DIR   specify additional lib path for compiler'
   echo '  --basedir=DIR          shortcut for the above two - DIR/include and DIR/lib'
   echo '  -j[N]           parallel make, N is the number of paralle make jobs'
+  echo "  --with-romio       build AMPI with ROMIO library"
   fi
   echo ''
   echo '<charmc-options>: normal compiler options e.g. -g -O -save -verbose'
@@ -174,6 +175,7 @@ LIBDIR=
 INCDIR=
 ARCH=
 BUILD_SHARED=
+WITH_ROMIO=
 
 [ "$1" = '--help' -o "$1" = '-h' ] && more=1 && syntax | more && exit 1
 [ $# -lt 2 ] && syntax && exit 1
@@ -219,6 +221,9 @@ do
            --no-build-shared|-nobs|--no-shared)
                BUILD_SHARED="-nobs"; shift
                ;;
+           --with-romio)
+               WITH_ROMIO="true"; shift
+               ;;
            --build-shared|-bs)
                # obsolete, do nothing
                shift
@@ -359,6 +364,11 @@ then
     echo "CMK_NO_BUILD_SHARED=true" >> $ConvSh
 fi
 
+if test  -n "$WITH_ROMIO" 
+then
+    echo "CMK_AMPI_WITH_ROMIO=\"true\"" >> $ConvSh
+fi
+
 echo $BASEVERSION > $VERSION/tmp/.vdir
 
 echo "Performing '$MAKE $MAKEOPTS $PROGRAM OPTS="$OPTS"' in $VERSION/tmp"
index a386b2698e57893e424f20c6f03472bd0dd5d72e..79da24b1228023ed961b1150975b052afd25704c 100644 (file)
@@ -25,7 +25,8 @@ COMPATLIB=$(LIBDIR)/libampi-compat.a
 .C.o:
        $(CHARMC) -c $<
 
-all: AMPI AMPIF $(COMPATLIB) AMPI-ROMIO
+all: AMPI AMPIF $(COMPATLIB)
+       cd $(CDIR)/tmp; CHARMINC=.; . ./conv-config.sh; cd $(PWD); if test -n "$$CMK_AMPI_WITH_ROMIO" ; then (make AMPI-ROMIO); fi
 
 $(ROMIOMAKE): $(COMPATLIB)
        cd romio && ./config.sh && cd .. 
index 41a41ef9f6882e3d4bc615e274b62fb9227b9b6f..5c1f8d7b51e642e6d214163083f409c5f1435222 100644 (file)
@@ -1,7 +1,3 @@
-
-
-
-
 /*****************************************************************************
  * $Source$
  * $Author$
index f061906937fcbcc9fb3a43633debd5578c71461c..e1ebc1918812a363a7e347074de50d5a03e33d74 100644 (file)
@@ -727,3 +727,33 @@ esac
 fi
 
 AC_OUTPUT()
+g.h conv-common.h \
+  conv-mach.h conv-autoconfig.h conv-mach-opt.h pup_c.h conv-cpm.h \
+  conv-cpath.h conv-qd.h conv-random.h conv-lists.h conv-trace.h \
+  persistent.h debug-conv.h pup.h middle.h middle-conv.h cklists.h \
+  ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h CkFutures.decl.h charisma.h charisma.decl.h \
+  tempo.h tempo.decl.h waitqd.h waitqd.decl.h sdag.h ckcheckpoint.h \
+  CkCheckpoint.decl.h ckarrayreductionmgr.h trace.h trace-bluegene.h \
+  envelope.h qd.h register.h stats.h ckfutures.h queueing.h \
+  CkMarshall.def.h
+       $(CHARMC) -c -I. ck.C
+
+main.o: main.C ck.h charm++.h charm.h converse.h conv-config.h \
+  conv-common.h conv-mach.h conv-autoconfig.h conv-mach-opt.h pup_c.h \
+  conv-cpm.h conv-cpath.h conv-qd.h conv-random.h conv-lists.h \
+  conv-trace.h persistent.h debug-conv.h pup.h middle.h middle-conv.h \
+  cklists.h ckbitvector.h ckstream.h init.h ckhashtable.h debug-charm.h \
+  CkMarshall.decl.h cksection.h ckcallback.h conv-ccs.h sockRoutines.h \
+  ccs-server.h ckobjQ.h ckreduction.h CkReduction.decl.h \
+  cknodegroupreduction.h CkArrayReductionMgr.decl.h ckmemcheckpoint.h \
+  CkMemCheckpoint.decl.h readonly.h ckarray.h cklocation.h LBDatabase.h \
+  lbdb.h LBDatabase.decl.h NullLB.decl.h BaseLB.decl.h CkLocation.decl.h \
+  CkArray.decl.h ComlibArrayListener.h ComlibStrategy.h \
+  convcomlibstrategy.h CkFutures.decl.h charisma.h charisma.d
\ No newline at end of file