diff --git a/seq_linear_solvers/amg/amg/Makefile b/seq_linear_solvers/amg/amg/Makefile
index 4173ba47f..b64138cd8 100644
--- a/seq_linear_solvers/amg/amg/Makefile
+++ b/seq_linear_solvers/amg/amg/Makefile
@@ -1,50 +1,61 @@
-COMP      = f77 
-LIBS      =  
-CFLAGS    = -g
-LDFLAGS   = -g
 
-AMGFILES   = amgs01.f input.f setup.f opdfn.f form.f trunc.f crushb.f tests.f \
-	memoryx.f crsgd.f setdep.f strong.f cforce.f ctest.f setcw.f \
-	color.f testsB.f setc.f setws.f iinvert.f bsetup.f rstdf0.f \
-	fftests.f misc.f
+.SUFFIXES:
+.SUFFIXES: .c .f .${AMG_ARCH}.o
 
-MSFILES   = ms.f
+AMG_SRC =\
+ amg.f\
+ amgs01.f\
+ bsetup.f\
+ cforce.f\
+ color.f\
+ crsgd.f\
+ crushb.f\
+ ctest.f\
+ fftests.f\
+ form.f\
+ iinvert.f\
+ input.f\
+ memoryx.f\
+ misc.f\
+ ms.f\
+ opdfn.f\
+ rstdf0.f\
+ setc.f\
+ setcw.f\
+ setdep.f\
+ setup.f\
+ setws.f\
+ strong.f\
+ tests.f\
+ testsB.f\
+ trunc.f
 
+AMG_OBJS1 = ${AMG_SRC:.c=.${AMG_ARCH}.o}
+AMG_OBJS  = ${AMG_OBJS1:.f=.${AMG_ARCH}.o}
 
-AMGOB  = amg.o
 LAPNOBJS  = lapn.o 
 
-MSOBJS    = ms.o
+##################################################################
+# Rules
+##################################################################
 
-AMGS01OBJS   = amgs01.o input.o setup.o opdfn.o form.o trunc.o crushb.o tests.o \
-	memoryx.o crsgd.o setdep.o strong.o cforce.o ctest.o setcw.o  \
-	color.o testsB.o setc.o setws.o iinvert.o bsetup.o rstdf0.o \
-	fftests.o misc.o
+${AMG_PROGRAM}.${AMG_ARCH}: ${AMG_OBJS}
+	@echo  "Linking" ${AMG_PROGRAM} "... "
+	@${AMG_LINK} -o ${AMG_PROGRAM}.${AMG_ARCH} \
+		${LFLAGS} ${AMG_OBJS} ${AMG_LIBS}
 
+lapn: ${LAPNOBJS} ${AMG_OBJS}
+	@echo  "Linking" lapn "... "
+	@${AMG_LINK} -o lapn \
+		${LFLAGS} ${LAPNOBJS} ${AMG_OBJS} ${AMG_LIBS}
 
+.c.${AMG_ARCH}.o:
+	@echo "Making (c) " $@
+	@${AMG_CC} -c ${CFLAGS} $<
 
-
-# Rules...
-
-# all: amg lapn
-
-amg: $(AMGOB) $(AMGS01OBJS) $(MSOBJS)
-	$(COMP) $(LDFLAGS) -o amg $(AMGOB) $(AMGS01OBJS) $(MSOBJS) $(LIBS)
-
-lapn:  $(LAPNOBJS) $(AMGS01OBJS) $(MSOBJS)
-	$(COMP) $(LDFLAGS) -o lapn $(LAPNOBJS) $(AMGS01OBJS) $(MSOBJS) $(LIBS)
-
+.f.${AMG_ARCH}.o:
+	@echo "Making (f) " $@
+	@${AMG_F77} -o $@ -c ${FFLAGS} $<
 
 amgs01.o: params.amg
 
-.f.o: 
-	$(COMP) -c $(CFLAGS) $?
-
-
-
-
-#
-   
-
-
-
diff --git a/seq_linear_solvers/amg/amg/build b/seq_linear_solvers/amg/amg/build
index fb498f92a..7eeb18a8e 100755
--- a/seq_linear_solvers/amg/amg/build
+++ b/seq_linear_solvers/amg/amg/build
@@ -7,12 +7,47 @@
 . $AMG_SRC/config/build_generic
 
 #=============================================================================
-# Build
+# Set various flags
 #=============================================================================
 
 AMG_PROGRAM=amg
 
-$AMG_MAKE
+CFLAGS="$AMG_CC_FLAGS -I$AMG_SRC/config"
+FFLAGS="$AMG_F77_FLAGS"
+LFLAGS="$AMG_LINK_FLAGS"
+
+if [ "$AMG_OPTIMIZE_FLAG" ]
+then
+   CFLAGS="$CFLAGS $AMG_CC_OPT"
+   FFLAGS="$FFLAGS $AMG_F77_OPT"
+   LFLAGS="$LFLAGS $AMG_LINK_OPT"
+fi
+
+if [ "$AMG_DEBUG_FLAG" ]
+then
+   CFLAGS="$CFLAGS $AMG_CC_DEBUG"
+   FFLAGS="$FFLAGS $AMG_F77_DEBUG"
+   LFLAGS="$LFLAGS $AMG_LINK_DEBUG"
+fi
+
+export AMG_PROGRAM CFLAGS FFLAGS LFLAGS
+
+#=============================================================================
+# Build
+#=============================================================================
+
+if [ "$AMG_ALL_FLAG" ]
+then
+   echo "Building"
+   echo "       Program:                $AMG_PROGRAM"
+   echo "       Arch:                   $AMG_ARCH"
+   echo "       CC Options:             $CFLAGS"
+   echo "       F77 Options:            $FFLAGS"
+
+   $AMG_MAKE $AMG_PROGRAM.$AMG_ARCH
+
+   echo "done"
+fi
 
 #=============================================================================
 # Install
@@ -27,7 +62,8 @@ then
      $AMG_MKDIR $AMG_BIN
    fi
 
-   $AMG_INSTALL $AMG_SRC/amg/$AMG_PROGRAM $AMG_BIN/.
+   $AMG_INSTALL $AMG_SRC/amg/$AMG_PROGRAM.$AMG_ARCH $AMG_BIN/$AMG_PROGRAM
+   $AMG_INSTALL $AMG_SRC/amg/lx $AMG_BIN/.
 fi
 
 #=============================================================================
@@ -36,11 +72,11 @@ fi
 
 if [ "$AMG_CLEAN_FLAG" ]
 then
-   rm -f *.o
+   rm -f *.$AMG_ARCH.o
 fi
 
 if [ "$AMG_VERYCLEAN_FLAG" ]
 then
-   rm -f $AMG_PROGRAM
+   rm -f $AMG_PROGRAM.$AMG_ARCH
 fi
 
diff --git a/seq_linear_solvers/amg/amg/lx b/seq_linear_solvers/amg/amg/lx
index fe207024d..174c938c8 100755
--- a/seq_linear_solvers/amg/amg/lx
+++ b/seq_linear_solvers/amg/amg/lx
@@ -1,3 +1,4 @@
+#!/bin/csh
 # makes links to AMG data files
 
 set AMGDAT = $1
diff --git a/seq_ls/amg/amg/Makefile b/seq_ls/amg/amg/Makefile
index 4173ba47f..b64138cd8 100644
--- a/seq_ls/amg/amg/Makefile
+++ b/seq_ls/amg/amg/Makefile
@@ -1,50 +1,61 @@
-COMP      = f77 
-LIBS      =  
-CFLAGS    = -g
-LDFLAGS   = -g
 
-AMGFILES   = amgs01.f input.f setup.f opdfn.f form.f trunc.f crushb.f tests.f \
-	memoryx.f crsgd.f setdep.f strong.f cforce.f ctest.f setcw.f \
-	color.f testsB.f setc.f setws.f iinvert.f bsetup.f rstdf0.f \
-	fftests.f misc.f
+.SUFFIXES:
+.SUFFIXES: .c .f .${AMG_ARCH}.o
 
-MSFILES   = ms.f
+AMG_SRC =\
+ amg.f\
+ amgs01.f\
+ bsetup.f\
+ cforce.f\
+ color.f\
+ crsgd.f\
+ crushb.f\
+ ctest.f\
+ fftests.f\
+ form.f\
+ iinvert.f\
+ input.f\
+ memoryx.f\
+ misc.f\
+ ms.f\
+ opdfn.f\
+ rstdf0.f\
+ setc.f\
+ setcw.f\
+ setdep.f\
+ setup.f\
+ setws.f\
+ strong.f\
+ tests.f\
+ testsB.f\
+ trunc.f
 
+AMG_OBJS1 = ${AMG_SRC:.c=.${AMG_ARCH}.o}
+AMG_OBJS  = ${AMG_OBJS1:.f=.${AMG_ARCH}.o}
 
-AMGOB  = amg.o
 LAPNOBJS  = lapn.o 
 
-MSOBJS    = ms.o
+##################################################################
+# Rules
+##################################################################
 
-AMGS01OBJS   = amgs01.o input.o setup.o opdfn.o form.o trunc.o crushb.o tests.o \
-	memoryx.o crsgd.o setdep.o strong.o cforce.o ctest.o setcw.o  \
-	color.o testsB.o setc.o setws.o iinvert.o bsetup.o rstdf0.o \
-	fftests.o misc.o
+${AMG_PROGRAM}.${AMG_ARCH}: ${AMG_OBJS}
+	@echo  "Linking" ${AMG_PROGRAM} "... "
+	@${AMG_LINK} -o ${AMG_PROGRAM}.${AMG_ARCH} \
+		${LFLAGS} ${AMG_OBJS} ${AMG_LIBS}
 
+lapn: ${LAPNOBJS} ${AMG_OBJS}
+	@echo  "Linking" lapn "... "
+	@${AMG_LINK} -o lapn \
+		${LFLAGS} ${LAPNOBJS} ${AMG_OBJS} ${AMG_LIBS}
 
+.c.${AMG_ARCH}.o:
+	@echo "Making (c) " $@
+	@${AMG_CC} -c ${CFLAGS} $<
 
-
-# Rules...
-
-# all: amg lapn
-
-amg: $(AMGOB) $(AMGS01OBJS) $(MSOBJS)
-	$(COMP) $(LDFLAGS) -o amg $(AMGOB) $(AMGS01OBJS) $(MSOBJS) $(LIBS)
-
-lapn:  $(LAPNOBJS) $(AMGS01OBJS) $(MSOBJS)
-	$(COMP) $(LDFLAGS) -o lapn $(LAPNOBJS) $(AMGS01OBJS) $(MSOBJS) $(LIBS)
-
+.f.${AMG_ARCH}.o:
+	@echo "Making (f) " $@
+	@${AMG_F77} -o $@ -c ${FFLAGS} $<
 
 amgs01.o: params.amg
 
-.f.o: 
-	$(COMP) -c $(CFLAGS) $?
-
-
-
-
-#
-   
-
-
-
diff --git a/seq_ls/amg/amg/build b/seq_ls/amg/amg/build
index fb498f92a..7eeb18a8e 100755
--- a/seq_ls/amg/amg/build
+++ b/seq_ls/amg/amg/build
@@ -7,12 +7,47 @@
 . $AMG_SRC/config/build_generic
 
 #=============================================================================
-# Build
+# Set various flags
 #=============================================================================
 
 AMG_PROGRAM=amg
 
-$AMG_MAKE
+CFLAGS="$AMG_CC_FLAGS -I$AMG_SRC/config"
+FFLAGS="$AMG_F77_FLAGS"
+LFLAGS="$AMG_LINK_FLAGS"
+
+if [ "$AMG_OPTIMIZE_FLAG" ]
+then
+   CFLAGS="$CFLAGS $AMG_CC_OPT"
+   FFLAGS="$FFLAGS $AMG_F77_OPT"
+   LFLAGS="$LFLAGS $AMG_LINK_OPT"
+fi
+
+if [ "$AMG_DEBUG_FLAG" ]
+then
+   CFLAGS="$CFLAGS $AMG_CC_DEBUG"
+   FFLAGS="$FFLAGS $AMG_F77_DEBUG"
+   LFLAGS="$LFLAGS $AMG_LINK_DEBUG"
+fi
+
+export AMG_PROGRAM CFLAGS FFLAGS LFLAGS
+
+#=============================================================================
+# Build
+#=============================================================================
+
+if [ "$AMG_ALL_FLAG" ]
+then
+   echo "Building"
+   echo "       Program:                $AMG_PROGRAM"
+   echo "       Arch:                   $AMG_ARCH"
+   echo "       CC Options:             $CFLAGS"
+   echo "       F77 Options:            $FFLAGS"
+
+   $AMG_MAKE $AMG_PROGRAM.$AMG_ARCH
+
+   echo "done"
+fi
 
 #=============================================================================
 # Install
@@ -27,7 +62,8 @@ then
      $AMG_MKDIR $AMG_BIN
    fi
 
-   $AMG_INSTALL $AMG_SRC/amg/$AMG_PROGRAM $AMG_BIN/.
+   $AMG_INSTALL $AMG_SRC/amg/$AMG_PROGRAM.$AMG_ARCH $AMG_BIN/$AMG_PROGRAM
+   $AMG_INSTALL $AMG_SRC/amg/lx $AMG_BIN/.
 fi
 
 #=============================================================================
@@ -36,11 +72,11 @@ fi
 
 if [ "$AMG_CLEAN_FLAG" ]
 then
-   rm -f *.o
+   rm -f *.$AMG_ARCH.o
 fi
 
 if [ "$AMG_VERYCLEAN_FLAG" ]
 then
-   rm -f $AMG_PROGRAM
+   rm -f $AMG_PROGRAM.$AMG_ARCH
 fi
 
diff --git a/seq_ls/amg/amg/lx b/seq_ls/amg/amg/lx
index fe207024d..174c938c8 100755
--- a/seq_ls/amg/amg/lx
+++ b/seq_ls/amg/amg/lx
@@ -1,3 +1,4 @@
+#!/bin/csh
 # makes links to AMG data files
 
 set AMGDAT = $1