diff -up matio-1.3.3/src/Makefile.in.automake matio-1.3.3/src/Makefile.in --- matio-1.3.3/src/Makefile.in.automake 2008-06-02 19:11:13.000000000 +0200 +++ matio-1.3.3/src/Makefile.in 2008-10-13 12:02:42.000000000 +0200 @@ -36,11 +36,13 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_FORTRAN_TRUE@am__append_1 = $(FCLDFLAGS) -@ENABLE_FORTRAN_TRUE@am__append_2 = fortran/create.f90 fortran/read_data.f90 \ -@ENABLE_FORTRAN_TRUE@ fortran/write_data.f90 fortran/write.f90 +@HAVE_ZLIB_TRUE@am__append_1 = inflate.c +@HAVE_ZLIB_TRUE@am__append_2 = $(ZLIB_LIBS) +@ENABLE_FORTRAN_TRUE@am__append_3 = $(FCLDFLAGS) +@ENABLE_FORTRAN_TRUE@am__append_4 = create.f90 read_data.f90 \ +@ENABLE_FORTRAN_TRUE@ write_data.f90 write.f90 -@ENABLE_FORTRAN_TRUE@am__append_3 = fortran/matio_internal.c fortran/matio.f90 +@ENABLE_FORTRAN_TRUE@am__append_5 = matio_internal.c matio.f90 subdir = src DIST_COMMON = $(am__noinst_HEADERS_DIST) $(include_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -71,14 +73,15 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) -libmatio_la_LIBADD = -am__libmatio_la_SOURCES_DIST = snprintf.c endian.c io.c inflate.c \ - read_data.c mat5.c mat4.c mat.c fortran/matio_internal.c \ - fortran/matio.f90 +am__DEPENDENCIES_1 = +@HAVE_ZLIB_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) +libmatio_la_DEPENDENCIES = $(am__DEPENDENCIES_2) +am__libmatio_la_SOURCES_DIST = snprintf.c endian.c io.c read_data.c \ + mat5.c mat4.c mat.c inflate.c matio_internal.c matio.f90 @HAVE_ZLIB_TRUE@am__objects_1 = inflate.lo @ENABLE_FORTRAN_TRUE@am__objects_2 = matio_internal.lo matio.lo -am_libmatio_la_OBJECTS = snprintf.lo endian.lo io.lo $(am__objects_1) \ - read_data.lo mat5.lo mat4.lo mat.lo $(am__objects_2) +am_libmatio_la_OBJECTS = snprintf.lo endian.lo io.lo read_data.lo \ + mat5.lo mat4.lo mat.lo $(am__objects_1) $(am__objects_2) libmatio_la_OBJECTS = $(am_libmatio_la_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = @@ -100,9 +103,8 @@ SOURCES = $(libmatio_la_SOURCES) DIST_SOURCES = $(am__libmatio_la_SOURCES_DIST) includeHEADERS_INSTALL = $(INSTALL_HEADER) nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) -am__noinst_HEADERS_DIST = matio_private.h mat4.h mat5.h \ - fortran/create.f90 fortran/read_data.f90 \ - fortran/write_data.f90 fortran/write.f90 +am__noinst_HEADERS_DIST = matio_private.h mat4.h mat5.h create.f90 \ + read_data.f90 write_data.f90 write.f90 HEADERS = $(include_HEADERS) $(nodist_include_HEADERS) \ $(noinst_HEADERS) ETAGS = etags @@ -228,14 +230,14 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign 1.8 no-dependencies AM_CFLAGS = -I. $(ZLIB_CFLAGS) -AM_LDFLAGS = $(am__append_1) -@HAVE_ZLIB_TRUE@ZLIB_SRC = inflate.c -noinst_HEADERS = matio_private.h mat4.h mat5.h $(am__append_2) +AM_LDFLAGS = $(am__append_3) +noinst_HEADERS = matio_private.h mat4.h mat5.h $(am__append_4) include_HEADERS = matio.h matioConfig.h lib_LTLIBRARIES = libmatio.la -libmatio_la_SOURCES = snprintf.c endian.c io.c $(ZLIB_SRC) read_data.c \ - mat5.c mat4.c mat.c $(am__append_3) -@ENABLE_FORTRAN_TRUE@AM_FCFLAGS = -I. -I$(top_builddir)/src/fortran +libmatio_la_SOURCES = snprintf.c endian.c io.c read_data.c mat5.c \ + mat4.c mat.c $(am__append_1) $(am__append_5) +libmatio_la_LIBADD = $(am__append_2) +@ENABLE_FORTRAN_TRUE@AM_FCFLAGS = -I. -I$(top_builddir)/src @ENABLE_FORTRAN_TRUE@nodist_include_HEADERS = $(top_builddir)/src/matio.mod dosubst = sed -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]VERSION[@],$(VERSION),g' \ @@ -337,9 +339,6 @@ distclean-compile: .c.lo: $(LTCOMPILE) -c -o $@ $< -matio_internal.lo: fortran/matio_internal.c - $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o matio_internal.lo `test -f 'fortran/matio_internal.c' || echo '$(srcdir)/'`fortran/matio_internal.c - .f90.o: $(FCCOMPILE) -c -o $@ $< @@ -349,9 +348,6 @@ matio_internal.lo: fortran/matio_interna .f90.lo: $(LTFCCOMPILE) -c -o $@ $< -matio.lo: fortran/matio.f90 - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) -c -o matio.lo `test -f 'fortran/matio.f90' || echo '$(srcdir)/'`fortran/matio.f90 - mostlyclean-libtool: -rm -f *.lo