1 files changed, 6 insertions, 7 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 619c7cc3..85a10510 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,13 @@
 # This Makefile.am is in the public domain
+
+SUBDIRS = include microhttpd .
+
 if RUN_LIBCURL_TESTS
-curltests = testcurl
-if HAVE_ZZUF
-if HAVE_SOCAT
-zzuftests = testzzuf
+SUBDIRS += testcurl
+if RUN_ZZUF_TESTS
+SUBDIRS += testzzuf
 endif
 endif
-endif
-
-SUBDIRS = include microhttpd $(curltests) $(zzuftests) .
 
 # Finally (last!) also build experimental lib...
 if HAVE_EXPERIMENTAL