From c98ce9a7d2744ad20132eb7b4a76074b07f22a15 Mon Sep 17 00:00:00 2001
From: jasonmoxham <jason@njkfrudils.plus.com>
Date: Wed, 21 Jul 2010 18:46:45 +0000
Subject: [PATCH] autotools

---
 Makefile.in     | 49 ++++++++++++++++++++-----------------------------
 mpn/Makefile.in |  2 --
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 90b72eda..09ca03b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,8 @@
 
 @SET_MAKE@
 
+# Process this file with automake to generate Makefile.in
+
 # Copyright 1991, 1993, 1994, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2006 Free Software Foundation, Inc.
 #
@@ -375,27 +377,10 @@ LIBMP_LT_REVISION = 0
 LIBMP_LT_AGE = 0
 SUBDIRS = tests $(am__append_1) mpn mpz mpq mpf printf scanf cxx tune \
 	doc
-
-# The "test -f" support for srcdir!=builddir is similar to the automake .c.o
-# etc rules, but with each foo.c explicitly, since $< is not portable
-# outside an inference rule.
-#
-# A quoted 'foo.c' is used with the "test -f"'s to avoid Sun make rewriting
-# it as part of its VPATH support.  See the autoconf manual "Limitations of
-# Make".
-#
-# Generated .h files which are used by gmp-impl.h are BUILT_SOURCES since
-# they must exist before anything can be compiled.
-#
-# Other generated .h files are also BUILT_SOURCES so as to get all the
-# build-system stuff over and done with at the start.  Also, dependencies on
-# the .h files are not properly expressed for the various objects that use
-# them.
 EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf \
 	mpirxx.h yasm_mac.inc.fat yasm_mac.inc.nofat strip_fPIC.sh \
 	mpn/x86w mpn/x86_64w build.vc9 build.vc10 doc/devel \
-	doc/fdl.texi cpuid.c gpl-2.0.txt lgpl-2.1.txt dumbmp.c \
-	gen-psqr.c
+	doc/fdl.texi cpuid.c gpl-2.0.txt lgpl-2.1.txt
 @WANT_CXX_TRUE@GMPXX_HEADERS_OPTION = mpirxx.h
 
 # mpir.h and mp.h are architecture dependent, mainly since they encode the
@@ -412,9 +397,8 @@ include_HEADERS = $(GMPXX_HEADERS_OPTION)
 nodist_includeexec_HEADERS = mpir.h
 lib_LTLIBRARIES = libmpir.la $(am__append_2) \
 	$(GMPXX_LTLIBRARIES_OPTION)
-BUILT_SOURCES = mpir.h mpn/perfsqr.h mpn/dummy1.c
-DISTCLEANFILES = $(BUILT_SOURCES) config.m4 fat.h @gmp_srclinks@ \
-	gen-psqr$(EXEEXT_FOR_BUILD)
+BUILT_SOURCES = mpir.h mpn/dummy1.c
+DISTCLEANFILES = $(BUILT_SOURCES) config.m4 fat.h @gmp_srclinks@
 
 # Tell mpir.h it's building gmp, not an application, used by windows DLL stuff.
 INCLUDES = -D__GMP_WITHIN_GMP
@@ -1166,14 +1150,21 @@ install-data-hook:
 	@echo '+-------------------------------------------------------------+'
 	@echo ''
 
-mpn/perfsqr.h: gen-psqr$(EXEEXT_FOR_BUILD)
-	./gen-psqr $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpn/perfsqr.h || (rm -f mpn/perfsqr.h; exit 1)
-
-gen-psqr$(EXEEXT_FOR_BUILD): gen-psqr$(U_FOR_BUILD).c dumbmp.c
-	$(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
-
-gen-psqr_.c: gen-psqr.c
-	$(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-psqr.c; then echo $(srcdir)/gen-psqr.c; else echo gen-psqr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' > gen-psqr_.c || rm -f gen-psqr_.c
+# The "test -f" support for srcdir!=builddir is similar to the automake .c.o
+# etc rules, but with each foo.c explicitly, since $< is not portable
+# outside an inference rule.
+#
+# A quoted 'foo.c' is used with the "test -f"'s to avoid Sun make rewriting
+# it as part of its VPATH support.  See the autoconf manual "Limitations of
+# Make".
+#
+# Generated .h files which are used by gmp-impl.h are BUILT_SOURCES since
+# they must exist before anything can be compiled.
+#
+# Other generated .h files are also BUILT_SOURCES so as to get all the
+# build-system stuff over and done with at the start.  Also, dependencies on
+# the .h files are not properly expressed for the various objects that use
+# them.
 
 mpn/dummy1.c:
 	echo "void dummy1(void){return;}" > mpn/dummy1.c
diff --git a/mpn/Makefile.in b/mpn/Makefile.in
index 68dc9988..8366e74a 100644
--- a/mpn/Makefile.in
+++ b/mpn/Makefile.in
@@ -524,8 +524,6 @@ uninstall-am:
 # These are BUILT_SOURCES at the top-level, so normally they're built before
 # recursing into this directory.
 #
-perfsqr.h:
-	cd ..; $(MAKE) $(AM_MAKEFLAGS) mpn/perfsqr.h
 dummy1.c:
 	cd ..; $(MAKE) $(AM_MAKEFLAGS) mpn/dummy1.c