Index: /mpich2/trunk/src/mpi/romio/mpi-io/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/mpi-io/Makefile.in (revision 4010)
+++ /mpich2/trunk/src/mpi/romio/mpi-io/Makefile.in (revision 4863)
@@ -7,10 +7,16 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir} -I../include -I${srcdir}/../adio/include -I../adio/include -I${srcdir}/../../../include  -I../../../include 
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(MPIOPROFILE) $(INCLUDE_DIR)
-
-top_builddir  = @master_topbuild_dir@
-LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL) 
+#DEFS            = @DEFS@ -I. -I${srcdir}
+CPPFLAGS        = @CPPFLAGS@
+INCLUDES = -I@MPI_INCLUDE_DIR@ -I${srcdir} -I../include \
+	   -I${srcdir}/../adio/include -I../adio/include \
+	   -I${srcdir}/../../../include  -I../../../include 
+#CFLAGS      = $(CPPFLAGS) @CFLAGS@ $(MPIOPROFILE) $(INCLUDES)
+CFLAGS          = @CFLAGS@ $(MPIOPROFILE)
+top_builddir    = @master_topbuild_dir@
+LIBTOOL         = @LIBTOOL@
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+#C_COMPILE_SHL = $(CC_SHL) 
 
 @VPATH@
@@ -109,12 +115,32 @@
 .SUFFIXES: $(SUFFIXES) .p .sp .lo .man .html .latex .txt 
 
+#	$(CC) $(CFLAGS) -c $<
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+#	@mv -f _s$*.o $*.lo
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
+#	$(CC) $(CFLAGS) -c $< -o _$*.o
 .c.p:
-	$(CC) $(CFLAGS) -c $< -o _$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< -o _$*.o ; \
+	fi
+	@$(C_COMPILE) -c $< -o _$*.o
 
 #	@cp $(srcdir)/$*.c _$*.c
@@ -122,6 +148,14 @@
 # Send the output to a .o file because some compilers require all object
 # files to have an extension of .o
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _sp$*.o
+#	@mv -f _sp$*.o _$*.lo
 .c.sp:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _sp$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _sp$*.o ; \
+	  echo mv -f _sp$*.o _$*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _sp$*.o
 	@mv -f _sp$*.o _$*.lo
 
@@ -186,109 +220,109 @@
 # Rules for the profiling objects
 _close.o: close.c
-	$(CC) $(CFLAGS) -c $(srcdir)/close.c -o _close.o
+	$(C_COMPILE) -c $(srcdir)/close.c -o _close.o
 _read.o: read.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read.c -o _read.o
+	$(C_COMPILE) -c $(srcdir)/read.c -o _read.o
 _open.o: open.c
-	$(CC) $(CFLAGS) -c $(srcdir)/open.c -o _open.o
+	$(C_COMPILE) -c $(srcdir)/open.c -o _open.o
 _get_extent.o: get_extent.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_extent.c -o _get_extent.o
+	$(C_COMPILE) -c $(srcdir)/get_extent.c -o _get_extent.o
 _write.o: write.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write.c -o _write.o
+	$(C_COMPILE) -c $(srcdir)/write.c -o _write.o
 _set_view.o: set_view.c
-	$(CC) $(CFLAGS) -c $(srcdir)/set_view.c -o _set_view.o
+	$(C_COMPILE) -c $(srcdir)/set_view.c -o _set_view.o
 _seek.o: seek.c
-	$(CC) $(CFLAGS) -c $(srcdir)/seek.c -o _seek.o
+	$(C_COMPILE) -c $(srcdir)/seek.c -o _seek.o
 _read_at.o: read_at.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_at.c -o _read_at.o
+	$(C_COMPILE) -c $(srcdir)/read_at.c -o _read_at.o
 _prealloc.o: prealloc.c
-	$(CC) $(CFLAGS) -c $(srcdir)/prealloc.c -o _prealloc.o
+	$(C_COMPILE) -c $(srcdir)/prealloc.c -o _prealloc.o
 _iread.o: iread.c
-	$(CC) $(CFLAGS) -c $(srcdir)/iread.c -o _iread.o
+	$(C_COMPILE) -c $(srcdir)/iread.c -o _iread.o
 _iwrite.o: iwrite.c
-	$(CC) $(CFLAGS) -c $(srcdir)/iwrite.c -o _iwrite.o
+	$(C_COMPILE) -c $(srcdir)/iwrite.c -o _iwrite.o
 _get_posn.o: get_posn.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_posn.c -o _get_posn.o
+	$(C_COMPILE) -c $(srcdir)/get_posn.c -o _get_posn.o
 _delete.o: delete.c
-	$(CC) $(CFLAGS) -c $(srcdir)/delete.c -o _delete.o
+	$(C_COMPILE) -c $(srcdir)/delete.c -o _delete.o
 _read_all.o: read_all.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_all.c -o _read_all.o
+	$(C_COMPILE) -c $(srcdir)/read_all.c -o _read_all.o
 _get_bytoff.o: get_bytoff.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_bytoff.c -o _get_bytoff.o
+	$(C_COMPILE) -c $(srcdir)/get_bytoff.c -o _get_bytoff.o
 _read_atall.o: read_atall.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_atall.c -o _read_atall.o
+	$(C_COMPILE) -c $(srcdir)/read_atall.c -o _read_atall.o
 _iread_at.o: iread_at.c
-	$(CC) $(CFLAGS) -c $(srcdir)/iread_at.c -o _iread_at.o
+	$(C_COMPILE) -c $(srcdir)/iread_at.c -o _iread_at.o
 _iwrite_at.o: iwrite_at.c
-	$(CC) $(CFLAGS) -c $(srcdir)/iwrite_at.c -o _iwrite_at.o
+	$(C_COMPILE) -c $(srcdir)/iwrite_at.c -o _iwrite_at.o
 _get_group.o: get_group.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_group.c -o _get_group.o
+	$(C_COMPILE) -c $(srcdir)/get_group.c -o _get_group.o
 _get_amode.o: get_amode.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_amode.c -o _get_amode.o
+	$(C_COMPILE) -c $(srcdir)/get_amode.c -o _get_amode.o
 _write_all.o: write_all.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_all.c -o _write_all.o
+	$(C_COMPILE) -c $(srcdir)/write_all.c -o _write_all.o
 _write_at.o: write_at.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_at.c -o _write_at.o
+	$(C_COMPILE) -c $(srcdir)/write_at.c -o _write_at.o
 _write_atall.o: write_atall.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_atall.c -o _write_atall.o
+	$(C_COMPILE) -c $(srcdir)/write_atall.c -o _write_atall.o
 _get_view.o: get_view.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_view.c -o _get_view.o
+	$(C_COMPILE) -c $(srcdir)/get_view.c -o _get_view.o
 _fsync.o: fsync.c
-	$(CC) $(CFLAGS) -c $(srcdir)/fsync.c -o _fsync.o
+	$(C_COMPILE) -c $(srcdir)/fsync.c -o _fsync.o
 _get_atom.o: get_atom.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_atom.c -o _get_atom.o
+	$(C_COMPILE) -c $(srcdir)/get_atom.c -o _get_atom.o
 _set_atom.o: set_atom.c
-	$(CC) $(CFLAGS) -c $(srcdir)/set_atom.c -o _set_atom.o
+	$(C_COMPILE) -c $(srcdir)/set_atom.c -o _set_atom.o
 _set_size.o: set_size.c
-	$(CC) $(CFLAGS) -c $(srcdir)/set_size.c -o _set_size.o
+	$(C_COMPILE) -c $(srcdir)/set_size.c -o _set_size.o
 _get_size.o: get_size.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_size.c -o _get_size.o
+	$(C_COMPILE) -c $(srcdir)/get_size.c -o _get_size.o
 _file_f2c.o: file_f2c.c
-	$(CC) $(CFLAGS) -c $(srcdir)/file_f2c.c -o _file_f2c.o
+	$(C_COMPILE) -c $(srcdir)/file_f2c.c -o _file_f2c.o
 _file_c2f.o: file_c2f.c
-	$(CC) $(CFLAGS) -c $(srcdir)/file_c2f.c -o _file_c2f.o
+	$(C_COMPILE) -c $(srcdir)/file_c2f.c -o _file_c2f.o
 _set_info.o: set_info.c
-	$(CC) $(CFLAGS) -c $(srcdir)/set_info.c -o _set_info.o
+	$(C_COMPILE) -c $(srcdir)/set_info.c -o _set_info.o
 _get_info.o: get_info.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_info.c -o _get_info.o
+	$(C_COMPILE) -c $(srcdir)/get_info.c -o _get_info.o
 _rd_atallb.o: rd_atallb.c
-	$(CC) $(CFLAGS) -c $(srcdir)/rd_atallb.c -o _rd_atallb.o
+	$(C_COMPILE) -c $(srcdir)/rd_atallb.c -o _rd_atallb.o
 _rd_atalle.o: rd_atalle.c
-	$(CC) $(CFLAGS) -c $(srcdir)/rd_atalle.c -o _rd_atalle.o
+	$(C_COMPILE) -c $(srcdir)/rd_atalle.c -o _rd_atalle.o
 _read_allb.o: read_allb.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_allb.c -o _read_allb.o
+	$(C_COMPILE) -c $(srcdir)/read_allb.c -o _read_allb.o
 _read_alle.o: read_alle.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_alle.c -o _read_alle.o
+	$(C_COMPILE) -c $(srcdir)/read_alle.c -o _read_alle.o
 _wr_atallb.o: wr_atallb.c
-	$(CC) $(CFLAGS) -c $(srcdir)/wr_atallb.c -o _wr_atallb.o
+	$(C_COMPILE) -c $(srcdir)/wr_atallb.c -o _wr_atallb.o
 _wr_atalle.o: wr_atalle.c
-	$(CC) $(CFLAGS) -c $(srcdir)/wr_atalle.c -o _wr_atalle.o
+	$(C_COMPILE) -c $(srcdir)/wr_atalle.c -o _wr_atalle.o
 _write_allb.o: write_allb.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_allb.c -o _write_allb.o
+	$(C_COMPILE) -c $(srcdir)/write_allb.c -o _write_allb.o
 _write_alle.o: write_alle.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_alle.c -o _write_alle.o
+	$(C_COMPILE) -c $(srcdir)/write_alle.c -o _write_alle.o
 _get_posn_sh.o: get_posn_sh.c
-	$(CC) $(CFLAGS) -c $(srcdir)/get_posn_sh.c -o _get_posn_sh.o
+	$(C_COMPILE) -c $(srcdir)/get_posn_sh.c -o _get_posn_sh.o
 _iread_sh.o: iread_sh.c
-	$(CC) $(CFLAGS) -c $(srcdir)/iread_sh.c -o _iread_sh.o
+	$(C_COMPILE) -c $(srcdir)/iread_sh.c -o _iread_sh.o
 _read_sh.o: read_sh.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_sh.c -o _read_sh.o
+	$(C_COMPILE) -c $(srcdir)/read_sh.c -o _read_sh.o
 _write_sh.o: write_sh.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_sh.c -o _write_sh.o
+	$(C_COMPILE) -c $(srcdir)/write_sh.c -o _write_sh.o
 _iwrite_sh.o: iwrite_sh.c
-	$(CC) $(CFLAGS) -c $(srcdir)/iwrite_sh.c -o _iwrite_sh.o
+	$(C_COMPILE) -c $(srcdir)/iwrite_sh.c -o _iwrite_sh.o
 _seek_sh.o: seek_sh.c
-	$(CC) $(CFLAGS) -c $(srcdir)/seek_sh.c -o _seek_sh.o
+	$(C_COMPILE) -c $(srcdir)/seek_sh.c -o _seek_sh.o
 _read_ord.o: read_ord.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_ord.c -o _read_ord.o
+	$(C_COMPILE) -c $(srcdir)/read_ord.c -o _read_ord.o
 _read_orde.o: read_orde.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_orde.c -o _read_orde.o
+	$(C_COMPILE) -c $(srcdir)/read_orde.c -o _read_orde.o
 _write_ordb.o: write_ordb.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_ordb.c -o _write_ordb.o
+	$(C_COMPILE) -c $(srcdir)/write_ordb.c -o _write_ordb.o
 _read_ordb.o: read_ordb.c
-	$(CC) $(CFLAGS) -c $(srcdir)/read_ordb.c -o _read_ordb.o
+	$(C_COMPILE) -c $(srcdir)/read_ordb.c -o _read_ordb.o
 _write_ord.o: write_ord.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_ord.c -o _write_ord.o
+	$(C_COMPILE) -c $(srcdir)/write_ord.c -o _write_ord.o
 _write_orde.o: write_orde.c
-	$(CC) $(CFLAGS) -c $(srcdir)/write_orde.c -o _write_orde.o
+	$(C_COMPILE) -c $(srcdir)/write_orde.c -o _write_orde.o
 _register_datarep.o: register_datarep.c
-	$(CC) $(CFLAGS) -c $(srcdir)/register_datarep.c -o _register_datarep.o
+	$(C_COMPILE) -c $(srcdir)/register_datarep.c -o _register_datarep.o
Index: /mpich2/trunk/src/mpi/romio/mpi-io/mpioimpl.h
===================================================================
--- /mpich2/trunk/src/mpi/romio/mpi-io/mpioimpl.h (revision 4674)
+++ /mpich2/trunk/src/mpi/romio/mpi-io/mpioimpl.h (revision 4863)
@@ -53,6 +53,6 @@
    four functions.  Defining these as empty should not change the behavior 
    of correct programs */
-#define MPIU_THREAD_CS_ENTER(ALLFUNC,)
-#define MPIU_THREAD_CS_EXIT(ALLFUNC,)
+#define MPIU_THREAD_CS_ENTER(x,y)
+#define MPIU_THREAD_CS_EXIT(x,y)
 #define MPIR_Nest_incr()
 #define MPIR_Nest_decr()
Index: /mpich2/trunk/src/mpi/romio/mpi-io/glue/mpich2/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/mpi-io/glue/mpich2/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/mpi-io/glue/mpich2/Makefile.in (revision 4863)
@@ -7,10 +7,15 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I../../../include -I${srcdir}/../../../mpi-io -I${srcdir}/../../../adio/include -I../../../adio/include -I${srcdir}/../../../../../../src/include  -I../../../../../../src/include 
-CFLAGS      = -DHAVE_MPI_INFO_SRC @CPPFLAGS@ @CFLAGS@ $(MPIOPROFILE) $(INCLUDE_DIR)
+#DEFS            = @DEFS@ -I. -I${srcdir}
+CPPFLAGS        = @CPPFLAGS@
+INCLUDES = -I@MPI_INCLUDE_DIR@ -I../../../include -I${srcdir}/../../../mpi-io -I${srcdir}/../../../adio/include -I../../../adio/include -I${srcdir}/../../../../../../src/include  -I../../../../../../src/include 
+#CFLAGS      = -DHAVE_MPI_INFO_SRC @CPPFLAGS@ @CFLAGS@ $(MPIOPROFILE) $(INCLUDES)
+CFLAGS          = -DHAVE_MPI_INFO_SRC @CFLAGS@ $(MPIOPROFILE)
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL)
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+#C_COMPILE_SHL = $(CC_SHL) 
 
 @VPATH@
@@ -25,17 +30,39 @@
 .SUFFIXES: $(SUFFIXES) .p .lo
 
+#	$(CC) $(CFLAGS) -c $<
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+#	@mv -f _s$*.o $*.lo
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
+#	$(CC) $(CFLAGS) -c $< -o _$*.o
 .c.p:
-	@cp $(srcdir)/$*.c _$*.c
-	$(CC) $(CFLAGS) -c _$*.c
-	@rm -f _$*.c
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< -o _$*.o ; \
+	fi
+	@$(C_COMPILE) -c $< -o _$*.o
 
 profile: 
 	sleep 1
+
+coverage:
+	-@for file in  ${MPIO_OBJECTS:.o=.c} ; do \
+		gcov -b -f $$file ; done
 
 $(LIBNAME): $(MPIO_OBJECTS)
Index: /mpich2/trunk/src/mpi/romio/mpi-io/fortran/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/mpi-io/fortran/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/mpi-io/fortran/Makefile.in (revision 4863)
@@ -7,10 +7,11 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I../../include -I${srcdir}/../../adio/include -I../../adio/include -I${srcdir}/..
-CFLAGS      = -DMPIO_FORTRAN_SRC @CFLAGS@ $(MPIOPROFILE) $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I../../include -I${srcdir}/../../adio/include -I../../adio/include -I${srcdir}/..
+CFLAGS      = -DMPIO_FORTRAN_SRC @CFLAGS@ $(MPIOPROFILE) 
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL)
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
 
 @VPATH@
@@ -66,8 +67,19 @@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
 
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
Index: /mpich2/trunk/src/mpi/romio/adio/ad_lustre/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_lustre/Makefile.in (revision 4055)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_lustre/Makefile.in (revision 4863)
@@ -7,10 +7,10 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL) @CFLAGS@ $(INCLUDE_DIR)
+C_COMPILE_SHL = $(CC_SHL) @CFLAGS@ $(INCLUDES)
 
 @VPATH@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_pvfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_pvfs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_pvfs/Makefile.in (revision 4863)
@@ -7,10 +7,15 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+#DEFS            = @DEFS@ -I. -I${srcdir}
+CPPFLAGS        = @CPPFLAGS@
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+#CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES) 
+CFLAGS          = @CFLAGS@
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL) 
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+#C_COMPILE_SHL = $(CC_SHL) 
 
 @VPATH@
@@ -29,8 +34,22 @@
 .SUFFIXES: $(SUFFIXES) .p .lo
 
+#	$(CC) $(CFLAGS) -c $<
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+#	@mv -f _s$*.o $*.lo
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
Index: /mpich2/trunk/src/mpi/romio/adio/ad_hfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_hfs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_hfs/Makefile.in (revision 4863)
@@ -4,6 +4,6 @@
 srcdir      = @srcdir@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 @VPATH@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_piofs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_piofs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_piofs/Makefile.in (revision 4863)
@@ -4,6 +4,6 @@
 srcdir      = @srcdir@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 @VPATH@
Index: /mpich2/trunk/src/mpi/romio/adio/common/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/common/Makefile.in (revision 2944)
+++ /mpich2/trunk/src/mpi/romio/adio/common/Makefile.in (revision 4863)
@@ -8,12 +8,16 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include \
+#DEFS            = @DEFS@ -I. -I${srcdir}
+CPPFLAGS        = @CPPFLAGS@
+INCLUDES = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include \
 	-I../../include -I${srcdir}/../../../../../src/include \
 	-I../../../../../src/include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR) 
-
-top_builddir  = @master_topbuild_dir@
-LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL) 
+#CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES) 
+CFLAGS          = @CFLAGS@
+top_builddir    = @master_topbuild_dir@
+LIBTOOL         = @LIBTOOL@
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+#C_COMPILE_SHL = $(CC_SHL) 
 
 @VPATH@
@@ -42,8 +46,22 @@
 .SUFFIXES: $(SUFFIXES) .p .lo
 
+#	$(CC) $(CFLAGS) $(INC) -c $<
 .c.o:
-	$(CC) $(CFLAGS) $(INC) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+#	@mv -f _s$*.o $*.lo
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
@@ -57,4 +75,8 @@
 	$(AR) $(SHLIBNAME).la $(AD_LOOBJECTS)
 
+coverage:
+	-@for file in  ${AD_OBJECTS:.o=.c} ; do \
+		gcov -b -f $$file ; done
+
 clean:
 	@rm -f *.o *.lo *.gcno *.gcda *.bb *.bbg
Index: /mpich2/trunk/src/mpi/romio/adio/ad_nfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_nfs/Makefile.in (revision 3078)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_nfs/Makefile.in (revision 4863)
@@ -7,10 +7,15 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+#DEFS            = @DEFS@ -I. -I${srcdir}
+CPPFLAGS        = @CPPFLAGS@
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include
+#CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
+CFLAGS          = @CFLAGS@
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL) 
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+#C_COMPILE_SHL = $(CC_SHL) 
 
 @VPATH@
@@ -28,8 +33,22 @@
 .SUFFIXES: $(SUFFIXES) .p .lo
 
+#	$(CC) $(CFLAGS) -c $<
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+#	@mv -f _s$*.o $*.lo
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
Index: /mpich2/trunk/src/mpi/romio/adio/ad_bglockless/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_bglockless/Makefile.in (revision 2953)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_bglockless/Makefile.in (revision 4863)
@@ -7,6 +7,6 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 top_builddir  = @master_topbuild_dir@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_pfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_pfs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_pfs/Makefile.in (revision 4863)
@@ -4,6 +4,6 @@
 srcdir      = @srcdir@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include 
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include 
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 @VPATH@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_sfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_sfs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_sfs/Makefile.in (revision 4863)
@@ -4,6 +4,6 @@
 srcdir      = @srcdir@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 @VPATH@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_ufs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_ufs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_ufs/Makefile.in (revision 4863)
@@ -7,10 +7,15 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+#DEFS            = @DEFS@ -I. -I${srcdir}
+CPPFLAGS        = @CPPFLAGS@
+INCLUDES = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+#CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES) 
+CFLAGS          = @CFLAGS@
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL) 
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+#C_COMPILE_SHL = $(CC_SHL) 
 
 @VPATH@
@@ -26,8 +31,22 @@
 .SUFFIXES: $(SUFFIXES) .p .lo
 
+#	$(CC) $(CFLAGS) -c $<
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+#	@mv -f _s$*.o $*.lo
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
Index: /mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/Makefile.in (revision 3444)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_zoidfs/Makefile.in (revision 4863)
@@ -7,6 +7,6 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 top_builddir  = @master_topbuild_dir@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_gridftp/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_gridftp/Makefile.in (revision 3078)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_gridftp/Makefile.in (revision 4863)
@@ -7,6 +7,6 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CFLAGS@ $(INCLUDES)
 
 top_builddir  = @master_topbuild_dir@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/Makefile.in (revision 2947)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_pvfs2/Makefile.in (revision 4863)
@@ -7,10 +7,11 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL)
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
 
 @VPATH@
@@ -32,7 +33,18 @@
 
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	    echo "  CC              $<" ; \
+	else \
+	    echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	    echo "  CC              $<" ; \
+	else \
+	    echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	    echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo
 
Index: /mpich2/trunk/src/mpi/romio/adio/ad_xfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_xfs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_xfs/Makefile.in (revision 4863)
@@ -7,6 +7,6 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES)
 
 top_builddir  = @master_topbuild_dir@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_bgl/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_bgl/Makefile.in (revision 3101)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_bgl/Makefile.in (revision 4863)
@@ -6,8 +6,8 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include @CPPFLAGS@
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR) -DBGL_OPTIM_STEP1_2=1 -DBGL_OPTIM_STEP1_1=1
+INCLUDES = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include @CPPFLAGS@
+CFLAGS      = @CFLAGS@ $(INCLUDES) -DBGL_OPTIM_STEP1_2=1 -DBGL_OPTIM_STEP1_1=1
 
-C_COMPILE_SHL = $(CC_SHL) @CFLAGS@ $(INCLUDE_DIR)
+C_COMPILE_SHL = $(CC_SHL) @CFLAGS@ $(INCLUDES)
 
 @VPATH@
Index: /mpich2/trunk/src/mpi/romio/adio/ad_panfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_panfs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_panfs/Makefile.in (revision 4863)
@@ -7,6 +7,6 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include -I/opt/panfs/include
-CFLAGS      = @CFLAGS@ $(INCLUDE_DIR)
+INCLUDES    = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include -I${srcdir}/../../../../include -I../../../../include -I/opt/panfs/include
+CFLAGS      = @CFLAGS@ $(INCLUDES)
 
 C_COMPILE_SHL = $(CC_SHL)
Index: /mpich2/trunk/src/mpi/romio/adio/ad_testfs/Makefile.in
===================================================================
--- /mpich2/trunk/src/mpi/romio/adio/ad_testfs/Makefile.in (revision 100)
+++ /mpich2/trunk/src/mpi/romio/adio/ad_testfs/Makefile.in (revision 4863)
@@ -8,10 +8,15 @@
 SHLIBNAME   = @SHLIBNAME@
 
-INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
-CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDE_DIR)
+#DEFS            = @DEFS@ -I. -I${srcdir}
+CPPFLAGS        = @CPPFLAGS@
+INCLUDES = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include -I../../include  -I${srcdir}/../../../../include -I../../../../include
+#CFLAGS      = @CPPFLAGS@ @CFLAGS@ $(INCLUDES) 
+CFLAGS          = @CFLAGS@
 
 top_builddir  = @master_topbuild_dir@
 LIBTOOL       = @LIBTOOL@
-C_COMPILE_SHL = $(CC_SHL) 
+C_COMPILE       = $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+C_COMPILE_SHL   = $(CC_SHL) $(DEFS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
+#C_COMPILE_SHL = $(CC_SHL) 
 
 @VPATH@
@@ -31,8 +36,22 @@
 .SUFFIXES: $(SUFFIXES) .p .lo
 
+#	$(CC) $(CFLAGS) -c $<
 .c.o:
-	$(CC) $(CFLAGS) -c $<
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE) -c $< ; \
+	fi
+	@$(C_COMPILE) -c $<
+#	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+#	@mv -f _s$*.o $*.lo
 .c.lo:
-	$(C_COMPILE_SHL) $(CFLAGS) -c $< -o _s$*.o
+	@if [ "x$(VERBOSE)" != "x1" ] ; then \
+	  echo "  CC              $<" ; \
+	else \
+	  echo $(C_COMPILE_SHL) -c $< -o _s$*.o ; \
+	  echo mv -f _s$*.o $*.lo ; \
+	fi
+	@$(C_COMPILE_SHL) -c $< -o _s$*.o
 	@mv -f _s$*.o $*.lo