Improved messaging in Makefile and src/simd_table_gen.c for 'make config'

2 files changed, 8 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 72469d1..1bfdb3a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,10 @@ endif
 # if Makefile.config does not exist, create empty lib/simd/config.h and warn
 ifeq (,$(wildcard Makefile.config))
 $(shell echo > lib/simd/config.h)
-ifneq (config,$(MAKECMDGOALS))
-$(error Run 'make config' or 'make NOSIMD=1 config' first)
+$(shell echo > lib/simd/dvs_simd.h)
+$(shell echo > lib/simd/dvs_simd.c)
+ifeq (,$(filter config clean,$(MAKECMDGOALS)))
+$(error Run 'make [NOSIMD=1] [SIMD_MAX_DVS=32] config' first)
 endif
 endif
 
@@ -155,7 +157,7 @@ endif
 		(echo "HAVE_SIMD=1" >> Makefile.config); \
 		(echo "#ifndef SHA1DC_HAVE_SIMD\n#define SHA1DC_HAVE_SIMD\n#endif\n" >> lib/simd/config.h); \
 		cat Makefile.config; \
-		echo "\nGenerating SIMD tables: lib/simd/dvs_simd.c lib/simd/dvs_simd.h..."; \
+		echo "\nGenerating SIMD tables using max $(SIMD_MAX_DVS) DVs: lib/simd/dvs_simd.c lib/simd/dvs_simd.h..."; \
 		($(MAKE) gen_simd_tables | grep "finalpadding" -A20 | cat) || (echo "FAILED !"); \
 	else \
 		(echo "HAVE_SIMD=0" >> Makefile.config); \
@@ -190,14 +192,13 @@ uninstall:
 
 .PHONY: clean
 clean:
-	-rm -rf bin Makefile.config lib/simd/config.h dep_lib obj_lib dep_src obj_src
+	-rm -rf bin Makefile.config lib/simd/config.h lib/simd/dvs_simd.* dep_lib obj_lib dep_src obj_src
 	-find . -type f -name '*.a' -print -delete
 	-find . -type f -name '*.d' -print -delete
 	-find . -type f -name '*.o' -print -delete
 	-find . -type f -name '*.la' -print -delete
 	-find . -type f -name '*.lo' -print -delete
 	-find . -type f -name '*.so' -print -delete
-	-find . -type d -name '.libs' -print | xargs rm -rv
 
 .PHONY: test
 test: tools
diff --git a/src/simd_table_gen.c b/src/simd_table_gen.c
index 1b63667..44878f4 100644
--- a/src/simd_table_gen.c
+++ b/src/simd_table_gen.c
@@ -248,7 +248,7 @@ int generate_code(DV_info_t* DVS, int nrdvs)
 		/* recompute optimal padding for this case */
 		eval_align(0, cnt58, cnt58 + bestpadding, cnt65);
 		nrcols = cnt58 + cnt65 + DV_order_info.pad1 + DV_order_info.pad2;
-		printf("Using [case58(%i) padding(%i) case65(%i) padding(%i)]*80 + finalpadding(%i)\n", cnt58, bestpadding, cnt65, DV_order_info.pad2, DV_order_info.finalpad);
+		printf("Using table structure: [case58(#=%i) padding(#=%i) case65(#=%i) padding(#=%i)]*80 + finalpadding(#=%i)\n", cnt58, bestpadding, cnt65, DV_order_info.pad2, DV_order_info.finalpad);
 		for (i=0,j=0; i < nrdvs; ++i)
 			if (DVS[i].ok58)
 				ordered_DVS[j++] = DVS+i;
@@ -264,7 +264,7 @@ int generate_code(DV_info_t* DVS, int nrdvs)
 		/* recompute optimal padding for this case */
 		eval_align(0, cnt65, cnt65 + bestpadding, cnt58);
 		nrcols = cnt58 + cnt65 + DV_order_info.pad1 + DV_order_info.pad2;
-		printf("Using [case65(%i) padding(%i) case58(%i) padding(%i)]*80 + finalpadding(%i)\n", cnt65, bestpadding, cnt58, DV_order_info.pad2, DV_order_info.finalpad);
+		printf("Using table structure: [case65(#=%i) padding(#=%i) case58(#=%i) padding(#=%i)]*80 + finalpadding(#=%i)\n", cnt65, bestpadding, cnt58, DV_order_info.pad2, DV_order_info.finalpad);
 		for (i=0,j=0; i < nrdvs; ++i)
 			if (DVS[i].ok65)
 				ordered_DVS[j++] = DVS+i;