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.

---
 libhal/GNUmakefile       | 15 ---------------
 libhal/Makefile          | 15 +++++++++++++++
 libhal/tests/GNUmakefile | 10 ----------
 libhal/tests/Makefile    | 10 ++++++++++
 libhal/utils/GNUmakefile | 10 ----------
 libhal/utils/Makefile    | 10 ++++++++++
 6 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 libhal/GNUmakefile
 create mode 100644 libhal/Makefile
 delete mode 100644 libhal/tests/GNUmakefile
 create mode 100644 libhal/tests/Makefile
 delete mode 100644 libhal/utils/GNUmakefile
 create mode 100644 libhal/utils/Makefile

(limited to 'libhal')

diff --git a/libhal/GNUmakefile b/libhal/GNUmakefile
deleted file mode 100644
index 13c39ec..0000000
--- a/libhal/GNUmakefile
+++ /dev/null
@@ -1,15 +0,0 @@
-ifndef CRYPTECH_ROOT
-  CRYPTECH_ROOT := $(abspath ../../..)
-endif
-
-TFMDIR := $(abspath ../libtfm)
-
-INC	= ${CRYPTECH_ROOT}/sw/libhal/hal.h
-LIB	= ../libhal.a
-
-CFLAGS += -I${CRYPTECH_ROOT}/sw/libhal
-
-vpath %.c ${CRYPTECH_ROOT}/sw/libhal
-vpath %.h ${CRYPTECH_ROOT}/sw/libhal:${LIBTFM_DIR}
-
-include ${CRYPTECH_ROOT}/sw/libhal/GNUmakefile
diff --git a/libhal/Makefile b/libhal/Makefile
new file mode 100644
index 0000000..82fc389
--- /dev/null
+++ b/libhal/Makefile
@@ -0,0 +1,15 @@
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../..)
+endif
+
+TFMDIR := $(abspath ../libtfm)
+
+INC	= ${CRYPTECH_ROOT}/sw/libhal/hal.h
+LIB	= ../libhal.a
+
+CFLAGS += -I${CRYPTECH_ROOT}/sw/libhal
+
+vpath %.c ${CRYPTECH_ROOT}/sw/libhal
+vpath %.h ${CRYPTECH_ROOT}/sw/libhal:${LIBTFM_DIR}
+
+include ${CRYPTECH_ROOT}/sw/libhal/Makefile
diff --git a/libhal/tests/GNUmakefile b/libhal/tests/GNUmakefile
deleted file mode 100644
index e158ecf..0000000
--- a/libhal/tests/GNUmakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ifndef CRYPTECH_ROOT
-  CRYPTECH_ROOT := $(abspath ../../../..)
-endif
-
-TFMDIR := $(abspath ../../libtfm)
-
-vpath %.c ${CRYPTECH_ROOT}/sw/libhal/tests
-vpath %.h ${CRYPTECH_ROOT}/sw/libhal/tests:${LIBTFM_DIR}
-
-include ${CRYPTECH_ROOT}/sw/libhal/tests/GNUmakefile
diff --git a/libhal/tests/Makefile b/libhal/tests/Makefile
new file mode 100644
index 0000000..61ad8b8
--- /dev/null
+++ b/libhal/tests/Makefile
@@ -0,0 +1,10 @@
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../../..)
+endif
+
+TFMDIR := $(abspath ../../libtfm)
+
+vpath %.c ${CRYPTECH_ROOT}/sw/libhal/tests
+vpath %.h ${CRYPTECH_ROOT}/sw/libhal/tests:${LIBTFM_DIR}
+
+include ${CRYPTECH_ROOT}/sw/libhal/tests/Makefile
diff --git a/libhal/utils/GNUmakefile b/libhal/utils/GNUmakefile
deleted file mode 100644
index cc428ae..0000000
--- a/libhal/utils/GNUmakefile
+++ /dev/null
@@ -1,10 +0,0 @@
-ifndef CRYPTECH_ROOT
-  CRYPTECH_ROOT := $(abspath ../../../..)
-endif
-
-TFMDIR := $(abspath ../../libtfm)
-
-vpath %.c ${CRYPTECH_ROOT}/sw/libhal/utils
-vpath %.h ${CRYPTECH_ROOT}/sw/libhal/utils:${LIBTFM_DIR}
-
-include ${CRYPTECH_ROOT}/sw/libhal/utils/GNUmakefile
diff --git a/libhal/utils/Makefile b/libhal/utils/Makefile
new file mode 100644
index 0000000..b15a0c5
--- /dev/null
+++ b/libhal/utils/Makefile
@@ -0,0 +1,10 @@
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../../..)
+endif
+
+TFMDIR := $(abspath ../../libtfm)
+
+vpath %.c ${CRYPTECH_ROOT}/sw/libhal/utils
+vpath %.h ${CRYPTECH_ROOT}/sw/libhal/utils:${LIBTFM_DIR}
+
+include ${CRYPTECH_ROOT}/sw/libhal/utils/Makefile
-- 
cgit v1.2.3