Fix passing object names to make_sunver.pl

	* Makefile.am (libffi.map-sun): Properly convert
	$(libffi_la_OBJECTS) to object names.
	* Makefile.in: Regenerate.

From-SVN: r233938

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index e74070a..b25ef5b 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,5 +1,11 @@
 2016-03-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 2016-03-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 

+       * Makefile.am (libffi.map-sun): Properly convert
+       $(libffi_la_OBJECTS) to object names.
+       * Makefile.in: Regenerate.
+
+2016-03-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+

        * Makefile.am (libffi.map-sun): Tabify:
        * Makefile.in: Regenerate.
 
        * Makefile.am (libffi.map-sun): Tabify:
        * Makefile.in: Regenerate.
 

diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index 159b6e8..dc43328 100644 (file)
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -215,8 +215,7 @@ libffi_version_dep = libffi.map-sun
 libffi.map-sun : libffi.map $(top_srcdir)/../contrib/make_sunver.pl \
                 $(libffi_la_OBJECTS) $(libffi_la_LIBADD)
        perl $(top_srcdir)/../contrib/make_sunver.pl libffi.map \
 libffi.map-sun : libffi.map $(top_srcdir)/../contrib/make_sunver.pl \
                 $(libffi_la_OBJECTS) $(libffi_la_LIBADD)
        perl $(top_srcdir)/../contrib/make_sunver.pl libffi.map \

-         $(libffi_la_OBJECTS:%.lo=.libs/%.o) \
-        `echo $(libffi_la_LIBADD) | \
+        `echo $(libffi_la_OBJECTS) $(libffi_la_LIBADD) | \

            sed 's,\([^/        ]*\)\.l\([ao]\),.libs/\1.\2,g'` \
         > $@ || (rm -f $@ ; exit 1)
 endif
            sed 's,\([^/        ]*\)\.l\([ao]\),.libs/\1.\2,g'` \
         > $@ || (rm -f $@ ; exit 1)
 endif

diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 20741ec..f4292b5 100644 (file)
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -1904,8 +1904,7 @@ stamp-build-info: doc/libffi.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp)
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libffi.map-sun : libffi.map $(top_srcdir)/../contrib/make_sunver.pl \
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@                $(libffi_la_OBJECTS) $(libffi_la_LIBADD)
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@       perl $(top_srcdir)/../contrib/make_sunver.pl libffi.map \
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@libffi.map-sun : libffi.map $(top_srcdir)/../contrib/make_sunver.pl \
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@                $(libffi_la_OBJECTS) $(libffi_la_LIBADD)
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@       perl $(top_srcdir)/../contrib/make_sunver.pl libffi.map \

-@LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@         $(libffi_la_OBJECTS:%.lo=.libs/%.o) \
-@LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@        `echo $(libffi_la_LIBADD) | \
+@LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@        `echo $(libffi_la_OBJECTS) $(libffi_la_LIBADD) | \

 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@           sed 's,\([^/        ]*\)\.l\([ao]\),.libs/\1.\2,g'` \
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@        > $@ || (rm -f $@ ; exit 1)
 
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@           sed 's,\([^/        ]*\)\.l\([ao]\),.libs/\1.\2,g'` \
 @LIBAT_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBAT_BUILD_VERSIONED_SHLIB_TRUE@        > $@ || (rm -f $@ ; exit 1)