From bdd052882bc4f1592d0d181a60344ceb8fbc393a Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Fri, 18 Jan 2019 11:48:35 +0100
Subject: clearer filenames

---
 test/monniaux/Makefile | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'test/monniaux')

diff --git a/test/monniaux/Makefile b/test/monniaux/Makefile
index 6dc4cf61..b7c3d8c5 100644
--- a/test/monniaux/Makefile
+++ b/test/monniaux/Makefile
@@ -4,27 +4,38 @@ K1C_CFLAGS=-Wall -O3 -std=c99
 K1C_CCOMP=../../ccomp
 K1C_CCOMPFLAGS=-Wall -O3 -D__thread= -D__int128=int
 
-PRODUCTS=int_mat.host int_mat.k1c int_mat.k1c_ccomp int_mat.k1c_ccomp.s int_mat.k1c.s
+PRODUCTS=int_mat.host int_mat.gcc.k1c int_mat.ccomp.k1c int_mat.ccomp.k1c.s int_mat.gcc.k1c.s
 
 all:	$(PRODUCTS)
 
-int_mat.host: int_mat.c int_mat_run.c modint.h
-	$(CC) $(CFLAGS) int_mat.c int_mat_run.c -o $@
+%.gcc.k1c.s: %.c
+	$(K1C_CC) $(K1C_CFLAGS) -S $< -o $@
+
+%.gcc.k1c.o: %.gcc.k1c.s
+	$(K1C_CC) $(K1C_CFLAGS) -c $< -o $@
+
+%.gcc.k1c.o: %.gcc.k1c.c
+	$(K1C_CC) $(K1C_CFLAGS) -c $< -o $@
 
-int_mat.k1c.s: int_mat.c modint.h
-	$(K1C_CC) $(K1C_CFLAGS) -S int_mat.c -o $@
+%.ccomp.k1c.s: %.c
+	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) -S $< -o $@
 
-int_mat.k1c: int_mat.k1c.s int_mat_run.k1c.o modint.h
-	$(K1C_CC) $(K1C_CFLAGS) int_mat.k1c.s int_mat_run.k1c.o -o $@
+%.ccomp.k1c.o: %.ccomp.k1c.s
+	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) -c $< -o $@
+
+%.ccomp.k1c.o: %.ccomp.k1c.c
+	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) -c $< -o $@
+
+int_mat.host: int_mat.c int_mat_run.c modint.h
+	$(CC) $(CFLAGS) int_mat.c int_mat_run.c -o $@
 
-int_mat_run.k1c.o: int_mat_run.c modint.h
-	$(K1C_CC) $(K1C_CFLAGS) -c int_mat_run.c -o $@
+int_mat.gcc.k1c.s int_mat.ccomp.k1c.s: modint.h
 
-int_mat.k1c_ccomp.s: int_mat.c modint.h
-	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) -S int_mat.c -o $@
+int_mat.gcc.k1c: int_mat.gcc.k1c.o int_mat_run.gcc.k1c.o
+	$(K1C_CC) $(K1C_CFLAGS) $+ -o $@
 
-int_mat.k1c_ccomp: int_mat.k1c_ccomp.s int_mat_run.k1c.o modint.h
-	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) int_mat.k1c_ccomp.s int_mat_run.k1c.o -o $@
+int_mat.ccomp.k1c: int_mat.ccomp.k1c.o int_mat_run.gcc.k1c.o
+	$(K1C_CCOMP) $(K1C_CCOMPFLAGS) $+ -o $@
 
 clean:
 	$(RM) -f $(PRODUCTS)
-- 
cgit