Clean it up

Author: kolemannix

.github/workflows/c.yml

@@ -14,13 +14,17 @@ jobs:
       run: sudo apt-get update && sudo apt-get install -y clang gcc make python3
     - name: make test
       run: make test
+    - name: Supplemental tests
+      run: |
+        make fetch-supplemental-data
+        make supplemental_tests
+    - name: make example
+      run: make example
+    - name: Check dirty single-header
+      run: git diff --exit-code ffc.h
     - name: cmake configure
       run: cmake -B build
     - name: cmake build
       run: cmake --build build -j 2
     - name: cmake test
       run: ctest --test-dir build -j 2
-    - name: make example
-      run: make example
-    - name: Check dirty single-header
-      run: git diff --exit-code ffc.h

Makefile

@@ -1,4 +1,4 @@
-.PHONY: test example fetch-supplemental-data
+.PHONY: test example fetch-supplemental-data supplemental_tests
 
 # Detect linux and define _DEFAULT_SOURCE if so
 UNAME_S := $(shell uname -s)
@@ -9,21 +9,36 @@ endif
 CLANG_FLAGS := -xc -Wall -Wextra -Wpedantic -O3 -g -std=c99 $(EXTRA_CFLAGS)
 SUPPLEMENTAL_TEST_FILES_DIR := out/supplemental_test_files
 SUPPLEMENTAL_TEST_DATA_DIR := $(SUPPLEMENTAL_TEST_FILES_DIR)/data
-SUPPLEMENTAL_TEST_FILES_REPO := https://github.com/fastfloat/supplemental_test_files.git
+
+ffc.h: src/ffc.h src/common.h src/parse.h src/digit_comparison.h src/api.h src/bigint.h amalgamate.py
+	python3 amalgamate.py > ffc.h
+
+out/example: ffc.h example.c | out
+	clang -xc -Wall -Wformat -Wpedantic -std=c99 example.c -o out/example
+
+example: out/example
+	./out/example
+
+out:
+	mkdir -p out
 
 out/test_runner: ffc.h test_src/test.c | out
 	gcc -xc -Wall -Wextra -Wpedantic ffc.h -fsyntax-only
 	clang $(CLANG_FLAGS) -I. -Itest_src test_src/test.c -o out/test_runner -lm
 
-test: out/test_runner out/test_int_runner out/supplemental_tests out/supplemental_tests_src
+test: out/test_runner out/test_int_runner out/supplemental_tests
 	./out/test_runner
 	./out/test_int_runner
-	./out/supplemental_tests
-	./out/supplemental_tests_src
 
 out/test_int_runner: ffc.h test_src/test_int.c | out
 	clang $(CLANG_FLAGS) -I. -Itest_src test_src/test_int.c -o out/test_int_runner -lm
 
+
+# Supplemental test stuff
+
+fetch-supplemental-data: | out
+	git clone --depth 1 https://github.com/fastfloat/supplemental_test_files.git $(SUPPLEMENTAL_TEST_FILES_DIR)
+
 $(SUPPLEMENTAL_TEST_DATA_DIR):
 	@test -d "$(SUPPLEMENTAL_TEST_DATA_DIR)" || { \
 		echo "Missing supplemental test data at $(SUPPLEMENTAL_TEST_DATA_DIR)." >&2; \
@@ -34,20 +49,5 @@ $(SUPPLEMENTAL_TEST_DATA_DIR):
 out/supplemental_tests: ffc.h test_src/supplemental_tests.c $(SUPPLEMENTAL_TEST_DATA_DIR) | out
 	clang $(CLANG_FLAGS) -I. -Itest_src -DSUPPLEMENTAL_TEST_DATA_DIR=\"$(SUPPLEMENTAL_TEST_DATA_DIR)\" test_src/supplemental_tests.c -o out/supplemental_tests -lm
 
-out/supplemental_tests_src: src/ffc.h test_src/supplemental_tests.c $(SUPPLEMENTAL_TEST_DATA_DIR) | out
-	clang $(CLANG_FLAGS) -Isrc -Itest_src -DSUPPLEMENTAL_TEST_DATA_DIR=\"$(SUPPLEMENTAL_TEST_DATA_DIR)\" test_src/supplemental_tests.c -o out/supplemental_tests_src -lm
-
-fetch-supplemental-data: | out
-	git clone --depth 1 $(SUPPLEMENTAL_TEST_FILES_REPO) $(SUPPLEMENTAL_TEST_FILES_DIR)
-
-ffc.h: src/ffc.h src/common.h src/parse.h src/digit_comparison.h src/api.h src/bigint.h amalgamate.py
-	python3 amalgamate.py > ffc.h
-
-out/example: ffc.h example.c | out
-	clang -xc -Wall -Wformat -Wpedantic -std=c99 example.c -o out/example
-
-example: out/example
-	./out/example
-
-out:
-	mkdir -p out
+supplemental_tests: out/supplemental_tests
+	./out/supplemental_tests