Rename bignum.h.in to bignum.h. Include version.h. Update Makefile and configure.nettle_3.1rc1

5 files changed, 22 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 73b54b3e..1f3b92b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ core
 /.lib
 /*.asm
 /Makefile
-/bignum.h
 /config.cache
 /config.h
 /config.h.in
diff --git a/ChangeLog b/ChangeLog
index eb9ad691..46f37a47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2015-03-26  Niels Möller  <nisse@diamant.hack.org>
 
+	* Makefile.in (PRE_CPPFLAGS): Drop -I$(srcdir), no longer needed.
+	(HEADERS): Added bignum.h. Removed version.h.
+	(INSTALL_HEADERS): Added version.h.
+	(DISTFILES): Removed bignum.h.in.
+	(bignum.h): Deleted make target.
+	(distclean-here): Don't delete bignum.h.
+
+	* configure.ac: No longer generate bignum.h.
+
+	* bignum.h: Renamed. Removed substitution of NETTLE_USE_MINI_GMP,
+	and include version.h instead.
+	* bignum.h.in: ... old name.
+
 	* version.h.in (NETTLE_USE_MINI_GMP): Substitute here.
 
 2015-03-25  Niels Möller  <nisse@diamant.hack.org>
diff --git a/Makefile.in b/Makefile.in
index e5f0c453..7ab903c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,8 +21,7 @@ SUBDIRS = tools testsuite examples
 
 include config.make
 
-# $(srcdir) is needed for includes in bignum.h.
-PRE_CPPFLAGS = -I. -I$(srcdir)
+PRE_CPPFLAGS = -I.
 EXTRA_CFLAGS = $(CCPIC)
 
 # FIXME: Add configuration of LIBEXT?
@@ -184,7 +183,7 @@ hogweed_SOURCES = sexp.c sexp-format.c \
 OPT_SOURCES = fat-x86_64.c fat-arm.c mini-gmp.c
 
 HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h \
-	  base16.h base64.h buffer.h camellia.h cast128.h \
+	  base16.h base64.h bignum.h buffer.h camellia.h cast128.h \
 	  cbc.h ccm.h chacha.h chacha-poly1305.h ctr.h \
 	  curve25519.h des.h des-compat.h dsa.h dsa-compat.h eax.h \
 	  ecc-curve.h ecc.h ecdsa.h eddsa.h \
@@ -195,13 +194,13 @@ HEADERS = aes.h arcfour.h arctwo.h asn1.h blowfish.h \
 	  md5.h md5-compat.h \
 	  memxor.h \
 	  nettle-meta.h nettle-types.h \
-	  pbkdf2.h version.h \
+	  pbkdf2.h \
 	  pgp.h pkcs1.h realloc.h ripemd160.h rsa.h \
 	  salsa20.h sexp.h \
 	  serpent.h sha.h sha1.h sha2.h sha3.h twofish.h \
 	  umac.h yarrow.h poly1305.h
 
-INSTALL_HEADERS = $(HEADERS) nettle-stdint.h bignum.h @IF_MINI_GMP@ mini-gmp.h
+INSTALL_HEADERS = $(HEADERS) nettle-stdint.h version.h @IF_MINI_GMP@ mini-gmp.h
 
 SOURCES = $(nettle_SOURCES) $(hogweed_SOURCES) \
 	  $(getopt_SOURCES) $(internal_SOURCES) \
@@ -213,7 +212,7 @@ SOURCES = $(nettle_SOURCES) $(hogweed_SOURCES) \
 DISTFILES = $(SOURCES) $(HEADERS) getopt.h getopt_int.h \
 	.bootstrap run-tests \
 	aclocal.m4 configure.ac \
-	configure stamp-h.in bignum.h.in version.h.in \
+	configure stamp-h.in version.h.in \
 	libnettle.map.in libhogweed.map.in \
 	config.guess config.sub install-sh texinfo.tex \
 	config.h.in config.m4.in config.make.in	Makefile.in \
@@ -417,9 +416,6 @@ stamp-h: config.h.in config.status
 	./config.status config.h
 	echo timestamp > stamp-h
 
-bignum.h: bignum.h.in config.status
-	./config.status $@
-
 Makefile: Makefile.in config.status
 	./config.status $@
 
@@ -631,7 +627,7 @@ clean-here:
 
 distclean-here: clean-here
 	-rm -f config.h stamp-h config.log config.status machine.m4 \
-	config.make config.m4 Makefile nettle-stdint.h bignum.h version.h \
+	config.make config.m4 Makefile nettle-stdint.h version.h \
 	nettle.pc hogweed.pc libnettle.map libhogweed.map \
 	*.asm *.d
 
diff --git a/bignum.h.in b/bignum.h
index 22ab3fe4..84530d38 100644
--- a/bignum.h.in
+++ b/bignum.h
@@ -38,7 +38,8 @@
 
 #include "nettle-types.h"
 
-#define NETTLE_USE_MINI_GMP @NETTLE_USE_MINI_GMP@
+/* For NETTLE_USE_MINI_GMP */
+#include "version.h"
 
 #if NETTLE_USE_MINI_GMP
 # include "mini-gmp.h"
diff --git a/configure.ac b/configure.ac
index 2b4c03c5..b35e566c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -901,7 +901,7 @@ if test x$GCC = xyes ; then
 # inttypes.h.
 fi
 
-AC_CONFIG_FILES([config.make config.m4 Makefile bignum.h version.h])
+AC_CONFIG_FILES([config.make config.m4 Makefile version.h])
 AC_CONFIG_FILES([tools/Makefile testsuite/Makefile examples/Makefile])
 AC_CONFIG_FILES([nettle.pc hogweed.pc libnettle.map libhogweed.map])