From 6c7ea9977c45116cc51aba7a4486059926d01113 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sun, 26 Jun 2016 01:04:05 -0400
Subject: More GNUmakefile cleanup.

---
 libtfm/GNUmakefile              | 46 -----------------------------------------
 libtfm/Makefile                 | 46 +++++++++++++++++++++++++++++++++++++++++
 libtfm/tomsfastmath/GNUmakefile |  8 -------
 libtfm/tomsfastmath/Makefile    |  8 +++++++
 4 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 libtfm/GNUmakefile
 create mode 100644 libtfm/Makefile
 delete mode 100644 libtfm/tomsfastmath/GNUmakefile
 create mode 100644 libtfm/tomsfastmath/Makefile

(limited to 'libtfm')

diff --git a/libtfm/GNUmakefile b/libtfm/GNUmakefile
deleted file mode 100644
index df90ddf..0000000
--- a/libtfm/GNUmakefile
+++ /dev/null
@@ -1,46 +0,0 @@
-
-# This duplicates more of sw/thirdparty/libtfm/GNUmakefile than I
-# would like, but it does the job.  Prettier makefiles can wait for another day.
-
-ifndef CRYPTECH_ROOT
-  CRYPTECH_ROOT := $(abspath ../../..)
-endif
-
-REPO := ${CRYPTECH_ROOT}/sw/thirdparty/libtfm
-
-# vpath %.c ${REPO}
-# vpath %.h ${REPO}
-
-BITS := 8192
-
-HDR  := ${REPO}/tomsfastmath/src/headers/tfm.h
-LIB  := tomsfastmath/libtfm.a
-
-#CFLAGS	+= -DTFM_X86
-#CFLAGS	+= -DTFM_NO_ASM
-
-CFLAGS	+= -fPIC -Wall -W -Wshadow -I${REPO}/tomsfastmath/src/headers -g3 -DFP_MAX_SIZE="(${BITS}*2+(8*DIGIT_BIT))"
-
-TARGETS	:= $(notdir ${HDR} ${LIB})
-
-all: ${TARGETS}
-
-clean:
-	rm -rf ${TARGETS} $(notdir ${HDR}.tmp) ${LIB} tomsfastmath/src
-
-distclean: clean
-	rm -f TAGS
-
-$(notdir ${HDR}): ${HDR}
-	echo  >$@.tmp '/* Configure size of largest bignum we want to handle -- see notes in tfm.pdf */'
-	echo >>$@.tmp '#define   FP_MAX_SIZE   (${BITS}*2+(8*DIGIT_BIT))'
-	echo >>$@.tmp ''
-	cat  >>$@.tmp $^
-	mv -f $@.tmp $@
-
-$(notdir ${LIB}): ${LIB}
-	ln -f $^ $@
-
-${LIB}: ${HDR}
-	(cd ${REPO} && find tomsfastmath/src -type d) | xargs mkdir -p
-	cd tomsfastmath; ${MAKE} CFLAGS='${CFLAGS}'
diff --git a/libtfm/Makefile b/libtfm/Makefile
new file mode 100644
index 0000000..b819bba
--- /dev/null
+++ b/libtfm/Makefile
@@ -0,0 +1,46 @@
+
+# This duplicates more of sw/thirdparty/libtfm/Makefile than I
+# would like, but it does the job.  Prettier makefiles can wait for another day.
+
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../..)
+endif
+
+REPO := ${CRYPTECH_ROOT}/sw/thirdparty/libtfm
+
+# vpath %.c ${REPO}
+# vpath %.h ${REPO}
+
+BITS := 8192
+
+HDR  := ${REPO}/tomsfastmath/src/headers/tfm.h
+LIB  := tomsfastmath/libtfm.a
+
+#CFLAGS	+= -DTFM_X86
+#CFLAGS	+= -DTFM_NO_ASM
+
+CFLAGS	+= -fPIC -Wall -W -Wshadow -I${REPO}/tomsfastmath/src/headers -g3 -DFP_MAX_SIZE="(${BITS}*2+(8*DIGIT_BIT))"
+
+TARGETS	:= $(notdir ${HDR} ${LIB})
+
+all: ${TARGETS}
+
+clean:
+	rm -rf ${TARGETS} $(notdir ${HDR}.tmp) ${LIB} tomsfastmath/src
+
+distclean: clean
+	rm -f TAGS
+
+$(notdir ${HDR}): ${HDR}
+	echo  >$@.tmp '/* Configure size of largest bignum we want to handle -- see notes in tfm.pdf */'
+	echo >>$@.tmp '#define   FP_MAX_SIZE   (${BITS}*2+(8*DIGIT_BIT))'
+	echo >>$@.tmp ''
+	cat  >>$@.tmp $^
+	mv -f $@.tmp $@
+
+$(notdir ${LIB}): ${LIB}
+	ln -f $^ $@
+
+${LIB}: ${HDR}
+	(cd ${REPO} && find tomsfastmath/src -type d) | xargs mkdir -p
+	cd tomsfastmath; ${MAKE} CFLAGS='${CFLAGS}'
diff --git a/libtfm/tomsfastmath/GNUmakefile b/libtfm/tomsfastmath/GNUmakefile
deleted file mode 100644
index ea0a524..0000000
--- a/libtfm/tomsfastmath/GNUmakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-ifndef CRYPTECH_ROOT
-  CRYPTECH_ROOT := $(abspath ../../../..)
-endif
-
-vpath %.c ${CRYPTECH_ROOT}/sw/thirdparty/libtfm/tomsfastmath
-vpath %.h ${CRYPTECH_ROOT}/sw/thirdparty/libtfm/tomsfastmath
-
-include ${CRYPTECH_ROOT}/sw/thirdparty/libtfm/tomsfastmath/makefile
diff --git a/libtfm/tomsfastmath/Makefile b/libtfm/tomsfastmath/Makefile
new file mode 100644
index 0000000..ea0a524
--- /dev/null
+++ b/libtfm/tomsfastmath/Makefile
@@ -0,0 +1,8 @@
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../../..)
+endif
+
+vpath %.c ${CRYPTECH_ROOT}/sw/thirdparty/libtfm/tomsfastmath
+vpath %.h ${CRYPTECH_ROOT}/sw/thirdparty/libtfm/tomsfastmath
+
+include ${CRYPTECH_ROOT}/sw/thirdparty/libtfm/tomsfastmath/makefile
-- 
cgit v1.2.3