[svn-r24859] Remove unnecessary use of $(srcdir).before_removing_mpiposix_vfd

Tested: local linux, h5committest

4 files changed, 11 insertions, 30 deletions

diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 2d597c6..d56df0d 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -180,9 +180,9 @@ H5fortran_detect.f90: H5test_kind$(EXEEXT)
 # how to compile a fortran program given its sources.
 
 if FORTRAN_HAVE_SIZEOF
-  H5test_kind_SOURCES = $(srcdir)/H5test_kind_SIZEOF.f90
+  H5test_kind_SOURCES = H5test_kind_SIZEOF.f90
 else
-  H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90
+  H5test_kind_SOURCES = H5test_kind.f90
 endif
 
 # Mark this directory as part of the Fortran API
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 9c3ab8c..7845bb8 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -162,8 +162,7 @@ H5fortran_detect_LDADD = $(LDADD)
 H5match_types_SOURCES = H5match_types.c
 H5match_types_OBJECTS = H5match_types.$(OBJEXT)
 H5match_types_LDADD = $(LDADD)
-am__H5test_kind_SOURCES_DIST = $(srcdir)/H5test_kind.f90 \
-	$(srcdir)/H5test_kind_SIZEOF.f90
+am__H5test_kind_SOURCES_DIST = H5test_kind.f90 H5test_kind_SIZEOF.f90
 @FORTRAN_HAVE_SIZEOF_FALSE@am_H5test_kind_OBJECTS =  \
 @FORTRAN_HAVE_SIZEOF_FALSE@	H5test_kind.$(OBJEXT)
 @FORTRAN_HAVE_SIZEOF_TRUE@am_H5test_kind_OBJECTS =  \
@@ -591,11 +590,11 @@ BUILT_SOURCES = H5f90i_gen.h
 # Automake knows how to build fortran programs if we tell it the source
 # files.
 H5fortran_detect_SOURCES = H5fortran_detect.f90
-@FORTRAN_HAVE_SIZEOF_FALSE@H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90
+@FORTRAN_HAVE_SIZEOF_FALSE@H5test_kind_SOURCES = H5test_kind.f90
 
 # H5test_kind.f90 is included in the distribution, and Automake knows
 # how to compile a fortran program given its sources.
-@FORTRAN_HAVE_SIZEOF_TRUE@H5test_kind_SOURCES = $(srcdir)/H5test_kind_SIZEOF.f90
+@FORTRAN_HAVE_SIZEOF_TRUE@H5test_kind_SOURCES = H5test_kind_SIZEOF.f90
 
 # Mark this directory as part of the Fortran API
 FORTRAN_API = yes
@@ -766,18 +765,6 @@ distclean-compile:
 .f90.lo:
 	$(AM_V_FC)$(LTFCCOMPILE) -c -o $@ $(FCFLAGS_f90) $<
 
-H5test_kind.o: $(srcdir)/H5test_kind.f90
-	$(AM_V_FC)$(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o H5test_kind.o $(FCFLAGS_f90) `test -f '$(srcdir)/H5test_kind.f90' || echo '$(srcdir)/'`$(srcdir)/H5test_kind.f90
-
-H5test_kind.obj: $(srcdir)/H5test_kind.f90
-	$(AM_V_FC)$(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o H5test_kind.obj $(FCFLAGS_f90) `if test -f '$(srcdir)/H5test_kind.f90'; then $(CYGPATH_W) '$(srcdir)/H5test_kind.f90'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/H5test_kind.f90'; fi`
-
-H5test_kind_SIZEOF.o: $(srcdir)/H5test_kind_SIZEOF.f90
-	$(AM_V_FC)$(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o H5test_kind_SIZEOF.o $(FCFLAGS_f90) `test -f '$(srcdir)/H5test_kind_SIZEOF.f90' || echo '$(srcdir)/'`$(srcdir)/H5test_kind_SIZEOF.f90
-
-H5test_kind_SIZEOF.obj: $(srcdir)/H5test_kind_SIZEOF.f90
-	$(AM_V_FC)$(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o H5test_kind_SIZEOF.obj $(FCFLAGS_f90) `if test -f '$(srcdir)/H5test_kind_SIZEOF.f90'; then $(CYGPATH_W) '$(srcdir)/H5test_kind_SIZEOF.f90'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/H5test_kind_SIZEOF.f90'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am
index eae296d..f02bb45 100644
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@@ -64,7 +64,7 @@ h5repack.sh.chkexe_: h5repacktst.chkexe_
 if HAVE_SHARED_CONDITIONAL
   # Build it as shared library if configure is enabled for shared library.
   lib_LTLIBRARIES=libdynlibadd.la
-  libdynlibadd_la_SOURCES=$(top_srcdir)/test/dynlib1.c
+  libdynlibadd_la_SOURCES=dynlib_rpk.c
 
 install-exec-hook:
 	$(RM) $(DESTDIR)$(libdir)/*dynlib*
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 9f0e6f1..f9b3018 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -117,8 +117,9 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libdynlibadd_la_LIBADD =
-am__libdynlibadd_la_SOURCES_DIST = $(top_srcdir)/test/dynlib1.c
-@HAVE_SHARED_CONDITIONAL_TRUE@am_libdynlibadd_la_OBJECTS = dynlib1.lo
+am__libdynlibadd_la_SOURCES_DIST = dynlib_rpk.c
+@HAVE_SHARED_CONDITIONAL_TRUE@am_libdynlibadd_la_OBJECTS =  \
+@HAVE_SHARED_CONDITIONAL_TRUE@	dynlib_rpk.lo
 libdynlibadd_la_OBJECTS = $(am_libdynlibadd_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -508,7 +509,7 @@ h5repack_SOURCES = $(COMMON_SOURCES) h5repack_main.c
 h5repacktst_SOURCES = $(COMMON_SOURCES) h5repacktst.c 
 testh5repack_detect_szip_SOURCES = testh5repack_detect_szip.c
 @HAVE_SHARED_CONDITIONAL_TRUE@lib_LTLIBRARIES = libdynlibadd.la
-@HAVE_SHARED_CONDITIONAL_TRUE@libdynlibadd_la_SOURCES = $(top_srcdir)/test/dynlib1.c
+@HAVE_SHARED_CONDITIONAL_TRUE@libdynlibadd_la_SOURCES = dynlib_rpk.c
 DISTCLEANFILES = h5repack.sh h5repack_plugin.sh
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
@@ -685,7 +686,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynlib1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynlib_rpk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_copy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/h5repack_filters.Po@am__quote@
@@ -718,13 +719,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-dynlib1.lo: $(top_srcdir)/test/dynlib1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT dynlib1.lo -MD -MP -MF $(DEPDIR)/dynlib1.Tpo -c -o dynlib1.lo `test -f '$(top_srcdir)/test/dynlib1.c' || echo '$(srcdir)/'`$(top_srcdir)/test/dynlib1.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dynlib1.Tpo $(DEPDIR)/dynlib1.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/test/dynlib1.c' object='dynlib1.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dynlib1.lo `test -f '$(top_srcdir)/test/dynlib1.c' || echo '$(srcdir)/'`$(top_srcdir)/test/dynlib1.c
-
 mostlyclean-libtool:
 	-rm -f *.lo