/[MITgcm]/MITgcm/tools/genmake2
ViewVC logotype

Diff of /MITgcm/tools/genmake2

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.71 by edhill, Wed Mar 10 23:34:04 2004 UTC revision 1.74 by adcroft, Wed Mar 24 17:12:51 2004 UTC
# Line 67  expand_pkg_groups() { Line 67  expand_pkg_groups() {
67          done          done
68          PACKAGES=$new_packages          PACKAGES=$new_packages
69          rm -f ./p[1,2].tmp          rm -f ./p[1,2].tmp
70            return $matched
71      else      else
72          echo "Warning: can't read package groups definition file: $PKG_GROUPS"          echo "Warning: can't read package groups definition file: $PKG_GROUPS"
73      fi      fi
# Line 80  find_possible_configs()  { Line 81  find_possible_configs()  {
81      tmp3=`echo $tmp2 | sed -e 's/power macintosh/ppc/'`      tmp3=`echo $tmp2 | sed -e 's/power macintosh/ppc/'`
82      tmp1=`echo $tmp3 | sed -e 's|x86_64|amd64|'`      tmp1=`echo $tmp3 | sed -e 's|x86_64|amd64|'`
83      tmp2=`echo $tmp1 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`      tmp2=`echo $tmp1 | sed -e 's/i[3-6]86/ia32/' | sed -e 's/athlon/ia32/'`
84      PLATFORM=$tmp2      tmp3=`echo $tmp2 | sed -e 's/cray sv1/craysv1/'`
85        PLATFORM=$tmp3
86      OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`      OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`
87      echo "  The platform appears to be:  $PLATFORM"      echo "  The platform appears to be:  $PLATFORM"
88            
# Line 119  find_possible_configs()  { Line 121  find_possible_configs()  {
121      #    4) fall back to the buggy local xmakedpend script      #    4) fall back to the buggy local xmakedpend script
122      #      #
123      if test "x${MAKEDEPEND}" = x ; then      if test "x${MAKEDEPEND}" = x ; then
124        which makedepend >& /dev/null        which makedepend > /dev/null 2>&1
125        RETVAL=$?        RETVAL=$?
126        if test ! "x${RETVAL}" = x0 ; then        if test ! "x${RETVAL}" = x0 ; then
127           echo "    a system-default makedepend was not found."           echo "    a system-default makedepend was not found."
# Line 585  SOURCEDIRS= Line 587  SOURCEDIRS=
587  INCLUDEDIRS=  INCLUDEDIRS=
588  STANDARDDIRS="USE_THE_DEFAULT"  STANDARDDIRS="USE_THE_DEFAULT"
589    
590    G2ARGS=
591  BASH=  BASH=
592  PWD=`pwd`  PWD=`pwd`
593  MAKE=make  MAKE=make
# Line 678  fi Line 681  fi
681  ac_prev=  ac_prev=
682  for ac_option ; do  for ac_option ; do
683    
684        G2ARGS="$G2ARGS \"$ac_option\""
685    
686      # If the previous option needs an argument, assign it.      # If the previous option needs an argument, assign it.
687      if test -n "$ac_prev"; then      if test -n "$ac_prev"; then
688          eval "$ac_prev=\$ac_option"          eval "$ac_prev=\$ac_option"
# Line 1186  else Line 1191  else
1191              PACKAGES="$PACKAGES $i"              PACKAGES="$PACKAGES $i"
1192          done          done
1193          echo "    before group expansion packages are: $PACKAGES"          echo "    before group expansion packages are: $PACKAGES"
1194          expand_pkg_groups          while ! expand_pkg_groups; do echo > /dev/null; done
1195          echo "    after group expansion packages are:  $PACKAGES"          echo "    after group expansion packages are:  $PACKAGES"
1196      fi      fi
1197  fi  fi
1198    
1199  echo "  applying DISABLE settings"  echo "  applying DISABLE settings"
1200    for i in $PACKAGES ; do
1201        echo $i >> ./.tmp_pack
1202    done
1203    for i in `grep  "-" ./.tmp_pack` ; do
1204        j=`echo $i | sed 's/[-]//'`
1205        DISABLE="$DISABLE $j"
1206    done
1207  pack=  pack=
1208  for p in $PACKAGES ; do  for p in $PACKAGES ; do
1209      addit="t"      addit="t"
# Line 1208  PACKAGES="$pack" Line 1220  PACKAGES="$pack"
1220  echo "  applying ENABLE settings"  echo "  applying ENABLE settings"
1221  echo "" > ./.tmp_pack  echo "" > ./.tmp_pack
1222  PACKAGES="$PACKAGES $ENABLE"  PACKAGES="$PACKAGES $ENABLE"
1223    # Test if each explicitly referenced package exists
1224  for i in $PACKAGES ; do  for i in $PACKAGES ; do
1225      if test ! -d "$ROOTDIR/pkg/$i" ; then      j=`echo $i | sed 's/[-+]//'`
1226        if test ! -d "$ROOTDIR/pkg/$j" ; then
1227          echo "Error: can't find package $i at \"$ROOTDIR/pkg/$i\""          echo "Error: can't find package $i at \"$ROOTDIR/pkg/$i\""
1228          exit 1          exit 1
1229      fi      fi
1230      echo $i >> ./.tmp_pack      echo $i >> ./.tmp_pack
1231  done  done
 pack=`cat ./.tmp_pack | sort | uniq`  
 rm -f ./.tmp_pack  
1232  PACKAGES=  PACKAGES=
1233  for i in $pack ; do  for i in `grep -v "-" ./.tmp_pack | sort | uniq` ; do
1234      PACKAGES="$PACKAGES $i"      PACKAGES="$PACKAGES $i"
1235  done  done
1236    rm -f ./.tmp_pack
1237  echo "    packages are:  $PACKAGES"  echo "    packages are:  $PACKAGES"
1238    
1239  echo "  applying package dependency rules"  echo "  applying package dependency rules"
# Line 1535  echo "#    $MACHINE" >> $MAKEFILE Line 1548  echo "#    $MACHINE" >> $MAKEFILE
1548  echo "# This makefile was generated automatically on" >> $MAKEFILE  echo "# This makefile was generated automatically on" >> $MAKEFILE
1549  echo "#    $THISDATE" >> $MAKEFILE  echo "#    $THISDATE" >> $MAKEFILE
1550  echo "# by the command:" >> $MAKEFILE  echo "# by the command:" >> $MAKEFILE
1551  echo "#    $0 $@" >> $MAKEFILE  echo "#    $0 $G2ARGS" >> $MAKEFILE
1552  echo "# executed by:" >> $MAKEFILE  echo "# executed by:" >> $MAKEFILE
1553  echo "#    $USER@${THISHOSTNAME}:${THISCWD}" >> $MAKEFILE  echo "#    $USER@${THISHOSTNAME}:${THISCWD}" >> $MAKEFILE
1554    
# Line 1656  depend: Line 1669  depend:
1669          @make links          @make links
1670          \$(MAKEDEPEND) -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)          \$(MAKEDEPEND) -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)
1671          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)          \$(TOOLSDIR)/f90mkdepend >> \$(MAKEFILE)
1672            -rm -f makedepend.out
1673    
1674  links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)  links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES) \$(SPECIAL_FILES)
1675    
# Line 1681  CLEAN: Line 1695  CLEAN:
1695    
1696  #eh3 Makefile: makefile  #eh3 Makefile: makefile
1697  makefile:  makefile:
1698          $THIS_SCRIPT $@          $THIS_SCRIPT $G2ARGS
1699  cleanlinks:  cleanlinks:
1700          -find . -type l -exec rm {} \;          -find . -type l -exec rm {} \;
1701    

Legend:
Removed from v.1.71  
changed lines
  Added in v.1.74

  ViewVC Help
Powered by ViewVC 1.1.22