Move fuzz directory to programs

programs/CMakeLists.txt

@@ -6,3 +6,4 @@ add_subdirectory(ssl)
 add_subdirectory(test)
 add_subdirectory(x509)
 add_subdirectory(util)
+add_subdirectory(fuzz)

programs/Makefile

@@ -90,9 +90,12 @@ endif
 
 .SILENT:
 
-.PHONY: all clean list
+.PHONY: all clean list fuzz
 
-all: $(APPS)
+all: $(APPS) fuzz
+
+fuzz:
+	$(MAKE) -C fuzz
 
 $(DEP):
 	$(MAKE) -C ../library
@@ -305,6 +308,7 @@ ifndef WINDOWS
 else
 	del /S /Q /F *.o *.exe
 endif
+	$(MAKE) -C fuzz clean
 
 list:
 	echo $(APPS)

tests/CMakeLists.txt

@@ -77,5 +77,3 @@ if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     link_to_source(scripts)
     link_to_source(ssl-opt.sh)
 endif()
-
-add_subdirectory(fuzz)

tests/Makefile

@@ -112,12 +112,9 @@ BINARIES := $(addsuffix $(EXEXT),$(APPS))
 
 .SILENT:
 
-.PHONY: all check test clean fuzz
+.PHONY: all check test clean
 
-all: $(BINARIES) fuzz
-
-fuzz:
-	$(MAKE) -C fuzz
+all: $(BINARIES)
 
 $(DEP):
 	$(MAKE) -C ../library
@@ -164,7 +161,6 @@ ifneq ($(wildcard TESTS/.*),)
 	rmdir /Q /S TESTS
 endif
 endif
-	$(MAKE) -C fuzz clean
 
 # Test suites caught by SKIP_TEST_SUITES are built but not executed.
 check: $(BINARIES)