* configure.in, acinclude.m4, Makefile.am, printf/Makefile.am,

	tests/printf/Makefile.am, gmp-h.in, gmp-impl.h, gmp.texi: Remove C++
	support, for the time being.

	* libmp.sym: New file.
	* Makefile.am (libmp_la_LDFLAGS): Use it.
	(DISTCLEANFILES): Remove asm-syntax.h, no longer generated.
	Remove some comments about "make check".

1 files changed, 14 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index e331fde99..a8181acd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,15 +22,6 @@
 # MA 02111-1307, USA.
 
 
-# make check
-#
-#     It'd be good if "make check" first did a "make all" or whatever to
-#     build libgmp.la, but it's not clear how best to do this.  Putting a
-#     "check:" target is overridden by automake, and a "check-local:" runs
-#     too late (due to depth-first subdirectory processing).  For now it's
-#     necessary to do "make && make check".
-
-
 # Libtool -version-info for libgmp.la and libmp.la.  See (libtool)Versioning
 #
 # 1. No interfaces changed, only implementations (good): Increment REVISION.
@@ -70,7 +61,7 @@ AUTOMAKE_OPTIONS = gnu check-news no-dependencies ansi2knr
 
 # FIXME: This is a workaround for automake not allowing info_TEXINFOS to be
 # conditionalized.  We want mpfr/mpfr.info only installed under
-# --enable-mpfr, but it and the test of mpfr always included in a "make
+# --enable-mpfr, but it and the rest of mpfr always included in a "make
 # dist".
 if WANT_MPFR
 MPFR_DIR = mpfr
@@ -88,14 +79,14 @@ SUBDIRS = tests mpn mpz mpq mpf printf mpbsd $(MPFR_DIR) demos tune
 nodist_include_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION)
 lib_LTLIBRARIES = libgmp.la $(MPBSD_LTLIBRARIES_OPTION)
 
-EXTRA_DIST = doc macos configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf
+EXTRA_DIST = doc macos \
+  configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf libmp.sym \
 
-DISTCLEANFILES = $(nodist_include_HEADERS) asm-syntax.h config.m4 \
-  @gmp_srclinks@
+DISTCLEANFILES = $(nodist_include_HEADERS) config.m4 @gmp_srclinks@
 
 # Generated by current texinfo.tex when processing gmp.texi.
 # FIXME: Maybe this should be added to automake.
-MOSTLYCLEANFILES= gmp.tmp
+MOSTLYCLEANFILES = gmp.tmp
 
 # Tell gmp.h it's building gmp, not an application, used by windows DLL stuff.
 INCLUDES=-D__GMP_WITHIN_GMP
@@ -179,10 +170,6 @@ MPQ_OBJECTS = mpq/abs$U.lo mpq/add$U.lo					\
 
 MPN_OBJECTS = @mpn_objs_in_libgmp@
 
-PRINTF_CXX_OBJECTS =						\
-  printf/doprntfx$U.lo printf/doprntix$U.lo printf/osfuns$U.lo	\
-  printf/osmpf$U.lo printf/osmpq$U.lo printf/osmpz$U.lo
-
 PRINTF_OBJECTS =							\
   printf/asprintf$U.lo							\
   printf/doprnt$U.lo printf/doprntf$U.lo printf/doprnti$U.lo		\
@@ -192,8 +179,7 @@ PRINTF_OBJECTS =							\
   printf/snprintf$U.lo printf/snprntffuns$U.lo				\
   printf/sprintf$U.lo printf/sprintffuns$U.lo				\
   printf/vasprintf$U.lo printf/vfprintf$U.lo printf/vprintf$U.lo	\
-  printf/vsnprintf$U.lo printf/vsprintf$U.lo				\
-  @PRINTF_CXX_OBJECTS@
+  printf/vsnprintf$U.lo printf/vsprintf$U.lo
 
 MPBSD_OBJECTS = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo	\
   mpbsd/powm$U.lo mpbsd/sub$U.lo mpbsd/cmp$U.lo mpbsd/mfree$U.lo	\
@@ -210,6 +196,10 @@ MPBSD_OBJECTS = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo	\
 # would probably work, but might risk missing something out or getting
 # something extra.  The source files for each .lo are listed in the
 # Makefile.am's in the subdirectories.
+#
+# Currently, unlike libmp below, we're not using -export-symbols, since the
+# tune and speed programs, and perhaps some of the test programs, want to
+# access undocumented symbols.
 
 libgmp_la_SOURCES = gmp-impl.h longlong.h				\
   assert.c compat.c errno.c extract-dbl.c insert-dbl.c memory.c		\
@@ -218,7 +208,7 @@ libgmp_la_SOURCES = gmp-impl.h longlong.h				\
   version.c
 libgmp_la_DEPENDENCIES = @TAL_OBJECT@ \
   $(MPF_OBJECTS) $(MPZ_OBJECTS) $(MPN_OBJECTS) $(MPQ_OBJECTS) $(PRINTF_OBJECTS)
-libgmp_la_LIBADD = $(libgmp_la_DEPENDENCIES) $(CXXLIBS)
+libgmp_la_LIBADD = $(libgmp_la_DEPENDENCIES)
 libgmp_la_LDFLAGS = $(GMP_LDFLAGS) \
   -version-info $(LIBGMP_LT_CURRENT):$(LIBGMP_LT_REVISION):$(LIBGMP_LT_AGE)
 
@@ -234,7 +224,7 @@ endif
 libmp_la_SOURCES = assert.c errno.c memory.c mp_bpl.c mp_clz_tab.c	\
   mp_minv_tab.c mp_set_fns.c
 MPN_OBJS_IN_LIBMP = @mpn_objs_in_libmp@
-libmp_la_DEPENDENCIES =							\
+libmp_la_DEPENDENCIES = $(srcdir)/libmp.sym				\
   @TAL_OBJECT@ $(MPBSD_OBJECTS) $(MPN_OBJS_IN_LIBMP)			\
   mpz/add$U.lo mpz/clear$U.lo mpz/cmp$U.lo mpz/init$U.lo mpz/mod$U.lo	\
   mpz/mul$U.lo mpz/mul_2exp$U.lo mpz/n_pow_ui$U.lo			\
@@ -242,7 +232,8 @@ libmp_la_DEPENDENCIES =							\
   mpz/set_ui$U.lo mpz/tdiv_r$U.lo mpz/sub$U.lo
 libmp_la_LIBADD = $(libmp_la_DEPENDENCIES)
 libmp_la_LDFLAGS = $(GMP_LDFLAGS) \
-  -version-info $(LIBMP_LT_CURRENT):$(LIBMP_LT_REVISION):$(LIBMP_LT_AGE)
+  -version-info $(LIBMP_LT_CURRENT):$(LIBMP_LT_REVISION):$(LIBMP_LT_AGE) \
+  -export-symbols $(srcdir)/libmp.sym
 
 
 # Optional objects, listed in a dummy library to generate ansi2knr rules and