A few minor cleanups as a result of a second-tree-checkout test and a

make-dist test. Re-ran auto-tools in romio distribution as a result, therefore regenerating all the Makefile.in's. This commit was SVN r2657.
2004-09-14 11:46:31 +00:00 · 2004-09-14 11:46:31 +00:00 · 1d8c2e3342
--- a/src/mca/io/romio/Makefile.am
+++ b/src/mca/io/romio/Makefile.am
@ -16,7 +16,7 @@ if OMPI_BUILD_io_romio_DSO
 component_noinst =
 component_install = mca_io_romio.la
 else
-component_noinst = libmca_mpi_io_romio.la
+component_noinst = libmca_io_romio.la
 component_install =
 endif

@ -29,6 +29,6 @@ mca_io_romio_la_LIBADD = $(libs)
 mca_io_romio_la_LDFLAGS = -module -avoid-version

 noinst_LTLIBRARIES = $(component_noinst)
-libmca_mpi_io_romio_la_SOURCES =
-libmca_mpi_io_romio_la_LIBADD = $(libs)
-libmca_mpi_io_romio_la_LDFLAGS = -module -avoid-version
+libmca_io_romio_la_SOURCES =
+libmca_io_romio_la_LIBADD = $(libs)
+libmca_io_romio_la_LDFLAGS = -module -avoid-version
--- a/src/mca/io/romio/romio-dist/Makefile.am
+++ b/src/mca/io/romio/romio-dist/Makefile.am
@ -5,7 +5,9 @@
 include $(top_ompi_srcdir)/config/Makefile.options

 SUBDIRS = include adio mpi-io 
-DIST_SUBDIRS = $(SUBDIRS) doc test
+DIST_SUBDIRS = $(SUBDIRS) doc
+
+EXTRA_DIST = README COPYRIGHT README_OMPI

 noinst_LTLIBRARIES = libromio_dist.la 
 libromio_dist_la_SOURCES = 
--- a/src/mca/io/romio/romio-dist/Makefile.in
+++ b/src/mca/io/romio/romio-dist/Makefile.in
@ -261,7 +261,8 @@ target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
 SUBDIRS = include adio mpi-io 
-DIST_SUBDIRS = $(SUBDIRS) doc test
+DIST_SUBDIRS = $(SUBDIRS) doc
+EXTRA_DIST = README COPYRIGHT README_OMPI
 noinst_LTLIBRARIES = libromio_dist.la 
 libromio_dist_la_SOURCES = 
 libromio_dist_la_LIBADD = \
--- a/src/mca/io/romio/romio-dist/aclocal.m4
+++ b/src/mca/io/romio/romio-dist/aclocal.m4
--- a/src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_hfs/Makefile.in
@ -258,7 +258,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
        -I$(top_ompi_srcdir)/src \
        -I$(top_ompi_srcdir)/src/include

--- a/src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_ntfs/Makefile.in
@ -0,0 +1,560 @@
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $HEADER$
+#
+
+SOURCES = $(libadio_ntfs_la_SOURCES)
+
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+subdir = adio/ad_ntfs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(mkdir_p)
+CONFIG_HEADER = $(top_builddir)/adio/include/romioconf.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libadio_ntfs_la_LIBADD =
+am_libadio_ntfs_la_OBJECTS = ad_ntfs.lo ad_ntfs_close.lo \
+	ad_ntfs_done.lo ad_ntfs_fcntl.lo ad_ntfs_flush.lo \
+	ad_ntfs_hints.lo ad_ntfs_iread.lo ad_ntfs_iwrite.lo \
+	ad_ntfs_open.lo ad_ntfs_rdcoll.lo ad_ntfs_read.lo \
+	ad_ntfs_resize.lo ad_ntfs_seek.lo ad_ntfs_wait.lo \
+	ad_ntfs_wrcoll.lo ad_ntfs_write.lo
+libadio_ntfs_la_OBJECTS = $(am_libadio_ntfs_la_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/adio/include
+depcomp = $(SHELL) $(top_srcdir)/../depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ad_ntfs.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_close.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_done.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_fcntl.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_flush.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_hints.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_iread.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_iwrite.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_open.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_rdcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_read.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_resize.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_seek.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_wait.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_wrcoll.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ad_ntfs_write.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libadio_ntfs_la_SOURCES)
+DIST_SOURCES = $(libadio_ntfs_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+srcdir = @srcdir@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+ARCH = @ARCH@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BITS = @BITS@
+BUILD_HFS_FALSE = @BUILD_HFS_FALSE@
+BUILD_HFS_TRUE = @BUILD_HFS_TRUE@
+BUILD_MPI_ARRAY = @BUILD_MPI_ARRAY@
+BUILD_MPI_INFO = @BUILD_MPI_INFO@
+BUILD_NFS_FALSE = @BUILD_NFS_FALSE@
+BUILD_NFS_TRUE = @BUILD_NFS_TRUE@
+BUILD_PFS_FALSE = @BUILD_PFS_FALSE@
+BUILD_PFS_TRUE = @BUILD_PFS_TRUE@
+BUILD_PIOFS_FALSE = @BUILD_PIOFS_FALSE@
+BUILD_PIOFS_TRUE = @BUILD_PIOFS_TRUE@
+BUILD_PVFS_FALSE = @BUILD_PVFS_FALSE@
+BUILD_PVFS_TRUE = @BUILD_PVFS_TRUE@
+BUILD_SFS_FALSE = @BUILD_SFS_FALSE@
+BUILD_SFS_TRUE = @BUILD_SFS_TRUE@
+BUILD_TESTFS_FALSE = @BUILD_TESTFS_FALSE@
+BUILD_TESTFS_TRUE = @BUILD_TESTFS_TRUE@
+BUILD_UFS_FALSE = @BUILD_UFS_FALSE@
+BUILD_UFS_TRUE = @BUILD_UFS_TRUE@
+BUILD_XFS_FALSE = @BUILD_XFS_FALSE@
+BUILD_XFS_TRUE = @BUILD_XFS_TRUE@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFINE_MPI_OFFSET = @DEFINE_MPI_OFFSET@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+F77GETARG = @F77GETARG@
+F77IARGC = @F77IARGC@
+FFLAGS = @FFLAGS@
+FILE_SYSTEM = @FILE_SYSTEM@
+FORTRAN_MPI_OFFSET = @FORTRAN_MPI_OFFSET@
+FORTRAN_TEST = @FORTRAN_TEST@
+FROM_MPICH = @FROM_MPICH@
+FTESTDEFINE = @FTESTDEFINE@
+HAVE_MPI_DARRAY_SUBARRAY = @HAVE_MPI_DARRAY_SUBARRAY@
+HAVE_MPI_INFO = @HAVE_MPI_INFO@
+HAVE_WEAK_SYMBOLS = @HAVE_WEAK_SYMBOLS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBNAME = @LIBNAME@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LL = @LL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKE = @MAKE@
+MAKEINFO = @MAKEINFO@
+MIPS = @MIPS@
+MPI = @MPI@
+MPIRUN = @MPIRUN@
+MPI_FARRAY1 = @MPI_FARRAY1@
+MPI_FARRAY2 = @MPI_FARRAY2@
+MPI_FARRAY3 = @MPI_FARRAY3@
+MPI_FARRAY4 = @MPI_FARRAY4@
+MPI_FARRAY5 = @MPI_FARRAY5@
+MPI_FARRAY6 = @MPI_FARRAY6@
+MPI_FARRAY7 = @MPI_FARRAY7@
+MPI_FINFO1 = @MPI_FINFO1@
+MPI_FINFO2 = @MPI_FINFO2@
+MPI_FINFO3 = @MPI_FINFO3@
+MPI_FINFO4 = @MPI_FINFO4@
+MPI_INCLUDE_DIR = @MPI_INCLUDE_DIR@
+MPI_LIB = @MPI_LIB@
+MPI_OFFSET_KIND1 = @MPI_OFFSET_KIND1@
+MPI_OFFSET_KIND2 = @MPI_OFFSET_KIND2@
+NEEDS_MPI_FINT = @NEEDS_MPI_FINT@
+NOF77 = @NOF77@
+NOPROFILE = @NOPROFILE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PREFIX = @PREFIX@
+RANLIB = @RANLIB@
+ROMIO_HOME = @ROMIO_HOME@
+ROMIO_INCLUDE = @ROMIO_INCLUDE@
+ROMIO_LFLAGS = @ROMIO_LFLAGS@
+ROMIO_LIBLIST = @ROMIO_LIBLIST@
+ROMIO_TCFLAGS = @ROMIO_TCFLAGS@
+ROMIO_TCPPFLAGS = @ROMIO_TCPPFLAGS@
+ROMIO_TFFLAGS = @ROMIO_TFFLAGS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TEST_CC = @TEST_CC@
+TEST_F77 = @TEST_F77@
+TEST_LIBNAME = @TEST_LIBNAME@
+USER_CFLAGS = @USER_CFLAGS@
+USER_FFLAGS = @USER_FFLAGS@
+VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+arch_IRIX = @arch_IRIX@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_ompi_builddir = @top_ompi_builddir@
+top_ompi_srcdir = @top_ompi_srcdir@
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
+        -I$(top_ompi_srcdir)/src \
+        -I$(top_ompi_srcdir)/src/include
+
+noinst_LTLIBRARIES = libadio_ntfs.la
+libadio_ntfs_la_SOURCES = \
+        ad_ntfs.c \
+        ad_ntfs.h \
+        ad_ntfs_close.c \
+        ad_ntfs_done.c \
+        ad_ntfs_fcntl.c \
+        ad_ntfs_flush.c \
+        ad_ntfs_hints.c \
+        ad_ntfs_iread.c \
+        ad_ntfs_iwrite.c \
+        ad_ntfs_open.c \
+        ad_ntfs_rdcoll.c \
+        ad_ntfs_read.c \
+        ad_ntfs_resize.c \
+        ad_ntfs_seek.c \
+        ad_ntfs_wait.c \
+        ad_ntfs_wrcoll.c \
+        ad_ntfs_write.c
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  adio/ad_ntfs/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  adio/ad_ntfs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libadio_ntfs.la: $(libadio_ntfs_la_OBJECTS) $(libadio_ntfs_la_DEPENDENCIES) 
+	$(LINK)  $(libadio_ntfs_la_LDFLAGS) $(libadio_ntfs_la_OBJECTS) $(libadio_ntfs_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_close.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_done.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_fcntl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_flush.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_hints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_iread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_iwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_open.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_rdcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_read.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_seek.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_wait.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_wrcoll.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad_ntfs_write.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-info-am
+
+
+include $(top_ompi_srcdir)/config/Makefile.options
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_pfs/Makefile.in
@ -258,7 +258,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
        -I$(top_ompi_srcdir)/src \
        -I$(top_ompi_srcdir)/src/include

--- a/src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_piofs/Makefile.in
@ -259,7 +259,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
        -I$(top_ompi_srcdir)/src \
        -I$(top_ompi_srcdir)/src/include

--- a/src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_pvfs/Makefile.in
@ -260,7 +260,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
        -I$(top_ompi_srcdir)/src \
        -I$(top_ompi_srcdir)/src/include

--- a/src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_sfs/Makefile.in
@ -258,7 +258,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
        -I$(top_ompi_srcdir)/src \
        -I$(top_ompi_srcdir)/src/include

--- a/src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_testfs/Makefile.in
@ -263,7 +263,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
        -I$(top_ompi_srcdir)/src \
        -I$(top_ompi_srcdir)/src/include

--- a/src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.in
+++ b/src/mca/io/romio/romio-dist/adio/ad_xfs/Makefile.in
@ -258,7 +258,9 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
+AM_CPPFLAGS = \
+        -DOMPI_BUILDING=1 \
+        -I$(top_ompi_builddir)/src/include \
        -I$(top_ompi_srcdir)/src \
        -I$(top_ompi_srcdir)/src/include

--- a/src/mca/io/romio/romio-dist/configure
+++ b/src/mca/io/romio/romio-dist/configure
@ -23373,7 +23373,7 @@ CFLAGS="$CFLAGS $OMPI_CFLAGS "'-I$(top_builddir)/include'
 # Create makefiles for all of the adio devices.  Only the ones that
 # are active will be called by the top level ROMIO make
 # Open MPI: revamped the AC_OUTPUT lines to fit our Makefile.am's
-                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile adio/Makefile adio/ad_nfs/Makefile adio/ad_ufs/Makefile adio/ad_xfs/Makefile adio/ad_hfs/Makefile adio/ad_sfs/Makefile adio/ad_pfs/Makefile adio/ad_testfs/Makefile adio/ad_pvfs/Makefile adio/ad_piofs/Makefile adio/common/Makefile adio/include/Makefile doc/Makefile include/Makefile include/mpio.h include/mpiof.h mpi-io/Makefile test/Makefile test/misc.c test/large_file.c test/runtests util/Makefile"
+                                                                                                                                                                                                                                                ac_config_files="$ac_config_files Makefile adio/Makefile adio/ad_nfs/Makefile adio/ad_ufs/Makefile adio/ad_xfs/Makefile adio/ad_hfs/Makefile adio/ad_sfs/Makefile adio/ad_pfs/Makefile adio/ad_ntfs/Makefile adio/ad_testfs/Makefile adio/ad_pvfs/Makefile adio/ad_piofs/Makefile adio/common/Makefile adio/include/Makefile doc/Makefile include/Makefile include/mpio.h include/mpiof.h mpi-io/Makefile test/Makefile test/misc.c test/large_file.c test/runtests util/Makefile"

 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@ -24002,6 +24002,7 @@ do
  "adio/ad_hfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES adio/ad_hfs/Makefile" ;;
  "adio/ad_sfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES adio/ad_sfs/Makefile" ;;
  "adio/ad_pfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES adio/ad_pfs/Makefile" ;;
+  "adio/ad_ntfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES adio/ad_ntfs/Makefile" ;;
  "adio/ad_testfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES adio/ad_testfs/Makefile" ;;
  "adio/ad_pvfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES adio/ad_pvfs/Makefile" ;;
  "adio/ad_piofs/Makefile" ) CONFIG_FILES="$CONFIG_FILES adio/ad_piofs/Makefile" ;;
--- a/src/mca/io/romio/romio-dist/configure.in
+++ b/src/mca/io/romio/romio-dist/configure.in
@ -1723,6 +1723,7 @@ AC_CONFIG_FILES([
 	adio/ad_hfs/Makefile
 	adio/ad_sfs/Makefile
 	adio/ad_pfs/Makefile
+	adio/ad_ntfs/Makefile
 	adio/ad_testfs/Makefile
 	adio/ad_pvfs/Makefile
 	adio/ad_piofs/Makefile
--- a/src/mca/io/romio/romio-dist/doc/Makefile.am
+++ b/src/mca/io/romio/romio-dist/doc/Makefile.am
@ -4,7 +4,7 @@
 # Portions taken from original ROMIO Makefile*
 #

-EXTRA_DIST = users-build.bbl users-guide.ps.gz users-guide.tex
+EXTRA_DIST = users-guide.bbl users-guide.ps.gz users-guide.tex

 all:
 	latex users-guide.tex
--- a/src/mca/io/romio/romio-dist/doc/Makefile.in
+++ b/src/mca/io/romio/romio-dist/doc/Makefile.in
@ -220,7 +220,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-EXTRA_DIST = users-build.bbl users-guide.ps.gz users-guide.tex
+EXTRA_DIST = users-guide.bbl users-guide.ps.gz users-guide.tex
 all: all-am

 .SUFFIXES:
--- a/src/mca/io/romio/romio-dist/include/Makefile.am
+++ b/src/mca/io/romio/romio-dist/include/Makefile.am
@ -4,5 +4,5 @@

 include $(top_ompi_srcdir)/config/Makefile.options

-noinst_HEADERS = mpio.h mpio.h
+noinst_HEADERS = mpio.h mpio.h io_romio_conv.h

--- a/src/mca/io/romio/romio-dist/include/Makefile.in
+++ b/src/mca/io/romio/romio-dist/include/Makefile.in
@ -223,7 +223,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_ompi_builddir = @top_ompi_builddir@
 top_ompi_srcdir = @top_ompi_srcdir@
-noinst_HEADERS = mpio.h mpio.h
+noinst_HEADERS = mpio.h mpio.h io_romio_conv.h
 all: all-am

 .SUFFIXES:
--- a/src/mca/io/romio/src/Makefile.am
+++ b/src/mca/io/romio/src/Makefile.am
@ -13,7 +13,6 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libmca_io_romio.la
 libmca_io_romio_la_SOURCES = \
 	io_romio.h \
-	io_romio_conv.h \
 	io_romio_component.c \
 	io_romio_file_open.c \
 	io_romio_file_read.c \