9 files changed, 31 insertions, 51 deletions
diff --git a/libraries/libcli/Makefile b/libraries/libcli/Makefile
index 509f493..bbd686d 100644
--- a/libraries/libcli/Makefile
+++ b/libraries/libcli/Makefile
@@ -8,19 +8,3 @@ vpath %.c ${REPO}
 vpath %.h ${REPO}
 
 include ${REPO}/Makefile
-
-# Kludge alert:
-#
-# We really should teach Makefiles that need libcli.h to look in the
-# right place, but we don't want to wire the current location of
-# libcli into too many Makefiles, since we intend to move it soon.
-#
-# So, for the moment, we just copy libcli.h.  Clean this up after the
-# the repository moves (and maybe do something about the general
-# assumption that header files and libraries always live in the same
-# directory, that's wrong in a VPATH-based world).
-
-all: $(abspath .)/libcli.h
-
-$(abspath .)/libcli.h: ${REPO}/libcli.h
-	cp -p $< $@
diff --git a/libraries/libhal/GNUmakefile b/libraries/libhal/GNUmakefile
deleted file mode 100644
index 03b1636..0000000
--- a/libraries/libhal/GNUmakefile
+++ /dev/null
@@ -1,14 +0,0 @@
-ifndef CRYPTECH_ROOT
-  CRYPTECH_ROOT := $(abspath ../../../..)
-endif
-
-REPO := ${CRYPTECH_ROOT}/sw/libhal
-
-TFMDIR := $(abspath ../libtfm)
-
-CFLAGS += -I${REPO}
-
-vpath %.c ${REPO}
-vpath %.h ${REPO}:${LIBTFM_DIR}
-
-include ${CRYPTECH_ROOT}/sw/libhal/GNUmakefile
diff --git a/libraries/libhal/Makefile b/libraries/libhal/Makefile
new file mode 100644
index 0000000..fbc3473
--- /dev/null
+++ b/libraries/libhal/Makefile
@@ -0,0 +1,10 @@
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../../..)
+endif
+
+REPO := ${CRYPTECH_ROOT}/sw/libhal
+
+vpath %.c ${REPO}
+vpath %.h ${REPO}
+
+include ${REPO}/Makefile
diff --git a/libraries/libhal/tests/GNUmakefile b/libraries/libhal/tests/GNUmakefile
deleted file mode 100644
index 1d7449a..0000000
--- a/libraries/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/libraries/libhal/tests/Makefile b/libraries/libhal/tests/Makefile
new file mode 100644
index 0000000..7553427
--- /dev/null
+++ b/libraries/libhal/tests/Makefile
@@ -0,0 +1,10 @@
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../../../..)
+endif
+
+REPO := ${CRYPTECH_ROOT}/sw/libhal
+
+vpath %.c ${REPO}/tests
+vpath %.h ${REPO}/tests
+
+include ${REPO}/tests/Makefile
diff --git a/libraries/libhal/utils/GNUmakefile b/libraries/libhal/utils/GNUmakefile
deleted file mode 100644
index 9d38efd..0000000
--- a/libraries/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/libraries/libhal/utils/Makefile b/libraries/libhal/utils/Makefile
new file mode 100644
index 0000000..43fbe0d
--- /dev/null
+++ b/libraries/libhal/utils/Makefile
@@ -0,0 +1,10 @@
+ifndef CRYPTECH_ROOT
+  CRYPTECH_ROOT := $(abspath ../../../../..)
+endif
+
+REPO := ${CRYPTECH_ROOT}/sw/libhal
+
+vpath %.c ${REPO}/utils
+vpath %.h ${REPO}/utils
+
+include ${REPO}/utils/Makefile
diff --git a/libraries/libtfm/GNUmakefile b/libraries/libtfm/Makefile
index ca86f80..4dfcb45 100644
--- a/libraries/libtfm/GNUmakefile
+++ b/libraries/libtfm/Makefile
@@ -1,5 +1,5 @@
 
-# This duplicates more of sw/thirdparty/libtfm/GNUmakefile than I
+# 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
diff --git a/libraries/libtfm/tomsfastmath/GNUmakefile b/libraries/libtfm/tomsfastmath/Makefile
index 7141763..7141763 100644
--- a/libraries/libtfm/tomsfastmath/GNUmakefile
+++ b/libraries/libtfm/tomsfastmath/Makefile