Regenerate

1 files changed, 25 insertions, 20 deletions

diff --git a/printf/Makefile.in b/printf/Makefile.in
index bb4eb161e..a962027b7 100644
--- a/printf/Makefile.in
+++ b/printf/Makefile.in
@@ -95,6 +95,7 @@ EXEEXT = @EXEEXT@
 GMP_LDFLAGS = @GMP_LDFLAGS@
 HAVE_MPFR = @HAVE_MPFR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBCXXPRINTF_LA = @LIBCXXPRINTF_LA@
 LIBM = @LIBM@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
@@ -126,9 +127,12 @@ AUTOMAKE_OPTIONS = gnu no-dependencies $(top_builddir)/ansi2knr
 
 INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
 
-@HAVE_CXX_TRUE@OPTION_CXX = doprntfx.cc doprntix.cc osfuns.cc osmpf.cc osmpq.cc osmpz.cc
 
-noinst_LTLIBRARIES = libprintf.la
+# Need C objects in their own convenience library since if a C++ object is
+# there then $(CXX) will be used in the libtool command, and that's not
+# always available.
+EXTRA_LTLIBRARIES = libcxxprintf.la
+noinst_LTLIBRARIES = libprintf.la @LIBCXXPRINTF_LA@
 
 libprintf_la_SOURCES = \
   asprintf.c doprnt.c doprntf.c doprnti.c				 \
@@ -137,29 +141,28 @@ libprintf_la_SOURCES = \
   vasprintf.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c		 \
   $(OPTION_CXX)
 
+
+libcxxprintf_la_SOURCES = \
+  doprntfx.cc doprntix.cc osfuns.cc osmpf.cc osmpq.cc osmpz.cc
+
 subdir = printf
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 
+libcxxprintf_la_LDFLAGS =
+libcxxprintf_la_LIBADD =
+am_libcxxprintf_la_OBJECTS = doprntfx.lo doprntix.lo osfuns.lo osmpf.lo \
+	osmpq.lo osmpz.lo
+libcxxprintf_la_OBJECTS = $(am_libcxxprintf_la_OBJECTS)
 libprintf_la_LDFLAGS =
 libprintf_la_LIBADD =
-@HAVE_CXX_TRUE@am_libprintf_la_OBJECTS = asprintf$U.lo doprnt$U.lo \
-@HAVE_CXX_TRUE@	doprntf$U.lo doprnti$U.lo fprintf$U.lo \
-@HAVE_CXX_TRUE@	obprintf$U.lo obvprintf$U.lo obprntffuns$U.lo \
-@HAVE_CXX_TRUE@	printf$U.lo printffuns$U.lo snprintf$U.lo \
-@HAVE_CXX_TRUE@	snprntffuns$U.lo sprintf$U.lo sprintffuns$U.lo \
-@HAVE_CXX_TRUE@	vasprintf$U.lo vfprintf$U.lo vprintf$U.lo \
-@HAVE_CXX_TRUE@	vsnprintf$U.lo vsprintf$U.lo doprntfx.lo \
-@HAVE_CXX_TRUE@	doprntix.lo osfuns.lo osmpf.lo osmpq.lo osmpz.lo
-@HAVE_CXX_FALSE@am_libprintf_la_OBJECTS = asprintf$U.lo doprnt$U.lo \
-@HAVE_CXX_FALSE@	doprntf$U.lo doprnti$U.lo fprintf$U.lo \
-@HAVE_CXX_FALSE@	obprintf$U.lo obvprintf$U.lo obprntffuns$U.lo \
-@HAVE_CXX_FALSE@	printf$U.lo printffuns$U.lo snprintf$U.lo \
-@HAVE_CXX_FALSE@	snprntffuns$U.lo sprintf$U.lo sprintffuns$U.lo \
-@HAVE_CXX_FALSE@	vasprintf$U.lo vfprintf$U.lo vprintf$U.lo \
-@HAVE_CXX_FALSE@	vsnprintf$U.lo vsprintf$U.lo
+am_libprintf_la_OBJECTS = asprintf$U.lo doprnt$U.lo doprntf$U.lo \
+	doprnti$U.lo fprintf$U.lo obprintf$U.lo obvprintf$U.lo \
+	obprntffuns$U.lo printf$U.lo printffuns$U.lo snprintf$U.lo \
+	snprntffuns$U.lo sprintf$U.lo sprintffuns$U.lo vasprintf$U.lo \
+	vfprintf$U.lo vprintf$U.lo vsnprintf$U.lo vsprintf$U.lo
 libprintf_la_OBJECTS = $(am_libprintf_la_OBJECTS)
 
 DEFS = @DEFS@
@@ -185,9 +188,9 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(libprintf_la_SOURCES)
+DIST_SOURCES = $(libcxxprintf_la_SOURCES) $(libprintf_la_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libprintf_la_SOURCES)
+SOURCES = $(libcxxprintf_la_SOURCES) $(libprintf_la_SOURCES)
 
 all: all-am
 
@@ -203,8 +206,10 @@ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.s
 
 clean-noinstLTLIBRARIES:
 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+libcxxprintf.la: $(libcxxprintf_la_OBJECTS) $(libcxxprintf_la_DEPENDENCIES)
+	$(CXXLINK)  $(libcxxprintf_la_LDFLAGS) $(libcxxprintf_la_OBJECTS) $(libcxxprintf_la_LIBADD) $(LIBS)
 libprintf.la: $(libprintf_la_OBJECTS) $(libprintf_la_DEPENDENCIES)
-	$(CXXLINK)  $(libprintf_la_LDFLAGS) $(libprintf_la_OBJECTS) $(libprintf_la_LIBADD) $(LIBS)
+	$(LINK)  $(libprintf_la_LDFLAGS) $(libprintf_la_OBJECTS) $(libprintf_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core