1 files changed, 10 insertions, 95 deletions
diff --git a/usr/src/test/crypto-tests/tests/hmac/Makefile b/usr/src/test/crypto-tests/tests/hmac/Makefile
index f1f1c00314..d2600902b6 100644
--- a/usr/src/test/crypto-tests/tests/hmac/Makefile
+++ b/usr/src/test/crypto-tests/tests/hmac/Makefile
@@ -13,103 +13,18 @@
 # Copyright 2019 Joyent, Inc.
 #
 
-include $(SRC)/cmd/Makefile.cmd
-include $(SRC)/test/Makefile.com
-include $(SRC)/cmd/Makefile.ctf
+ALGS	= hmac_sha1
 
-ALGS = hmac_sha1
-CRYPTO = pkcs kcf
+all	:=	TARGET = all
+install	:=	TARGET = install
+clean	:=	TARGET = clean
+clobber	:=	TARGET = clobber
 
-PROGS_pkcs_32 = $(ALGS:%=%_32_pkcs)
-PROGS_pkcs_64 = $(ALGS:%=%_64_pkcs)
-PROGS_kcf_32 = $(ALGS:%=%_32_kcf)
-PROGS_kcf_64 = $(ALGS:%=%_64_kcf)
-PROGS_pkcs = $(PROGS_pkcs_32) $(PROGS_pkcs_64)
-PROGS_kcf = $(PROGS_kcf_32) $(PROGS_kcf_64)
-PROGS_32 = $(PROGS_pkcs_32) $(PROGS_kcf_32)
-PROGS_64 = $(PROGS_pkcs_64) $(PROGS_kcf_64)
-PROGS = $(PROGS_32) $(PROGS_64)
+.KEEP_STATE:
 
-ROOTOPTPKG = $(ROOT)/opt/crypto-tests
-TESTROOT = $(ROOTOPTPKG)/tests/hmac
-TESTDIR_pkcs = $(TESTROOT)/pkcs
-TESTDIR_kcf = $(TESTROOT)/kcf
+all clean clobber install: $(ALGS)
 
-COMMONDIR = ../common
+$(ALGS): FRC
+	$(MAKE) -e -f Makefile.hmac BASEPROG=$@ $(TARGET)
 
-$(CRYPTO:%=hmac_sha1_32_%)	:= OBJS = hmac_sha1.32.o
-$(CRYPTO:%=hmac_sha1_64_%)	:= OBJS = hmac_sha1.64.o
-
-$(PROGS_32)		:= OBJS_COMMON = main.32.o $(COMMONDIR)/testfuncs.32.o
-$(PROGS_64)		:= OBJS_COMMON = main.64.o $(COMMONDIR)/testfuncs.64.o
-$(PROGS_pkcs_32)	:= OBJS_COMMON += $(COMMONDIR)/cryptotest_pkcs.32.o
-$(PROGS_pkcs_64)	:= OBJS_COMMON += $(COMMONDIR)/cryptotest_pkcs.64.o
-$(PROGS_kcf_32)		:= OBJS_COMMON += $(COMMONDIR)/cryptotest_kcf.32.o
-$(PROGS_kcf_64)		:= OBJS_COMMON += $(COMMONDIR)/cryptotest_kcf.64.o
-
-CSTD = $(CSTD_GNU99)
-
-CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CPPFLAGS += -I$(COMMONDIR) -I$(SRC)/common/crypto
-
-$(PROGS_pkcs) := LDLIBS += -lpkcs11 -lcryptoutil
-
-CMDS_pkcs = $(PROGS_pkcs:%_pkcs=$(TESTDIR_pkcs)/%)
-CMDS_kcf = $(PROGS_kcf:%_kcf=$(TESTDIR_kcf)/%)
-CMDS = $(CMDS_pkcs) $(CMDS_kcf)
-
-$(CMDS) := FILEMODE = 0555
-
-all: $(PROGS)
-
-$(PROGS): main.32.o main.64.o
-
-%_32_pkcs: %.32.o
-	$(LINK.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_pkcs: %.64.o
-	$(LINK64.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_32_kcf: %.32.o
-	$(LINK.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_kcf: %.64.o
-	$(LINK64.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%.32.o: %.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-%.64.o: %.c
-	$(COMPILE64.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-
-install: all $(CMDS)
-
-clobber: clean
-	-$(RM) $(PROGS)
-
-clean:
-	-$(RM) $(ALGS:%=%.32.o) $(ALGS:%=%.64.o) main.32.o main.64.o
-
-$(CMDS): $(TESTDIR_pkcs) $(TESTDIR_kcf) $(PROGS)
-
-$(TESTDIR_pkcs) $(TESTDIR_kcf):
-	$(INS.dir)
-
-$(TESTDIR_pkcs)/%_32: %_32_pkcs
-	$(INS.rename)
-
-$(TESTDIR_pkcs)/%_64: %_64_pkcs
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_32: %_32_kcf
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_64: %_64_kcf
-	$(INS.rename)
+FRC: