From 3f03987897078cd9cb4845b5473c58bbebb0ce45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Thu, 13 Jul 2017 15:39:46 +0200
Subject: [PATCH] Fix fuzz/ regression tester building

---
 fuzz/Makefile.am | 71 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 25 deletions(-)

diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
index e5868ab..383f4d0 100644
--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@@ -4,17 +4,54 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -DSRCDIR=\"$(abs_srcdir)\" -DT
 AM_LDFLAGS = -no-install
 LDADD = ../src/libpsl.la $(LIBICU_LIBS) $(LIBIDN_LIBS) $(LIBIDN2_LIBS)
 
-PSL_TESTS = \
- libpsl_fuzzer$(EXEEXT) \
- libpsl_load_fuzzer$(EXEEXT) \
- libpsl_load_dafsa_fuzzer$(EXEEXT)
+if WITH_LIBICU
+  XLIBS = $(LIBICU_LIBS)
+  XTYPE = _icu
+  libpsl_icu_fuzzer_SOURCES = libpsl_fuzzer.c main.c fuzzer.h
+  libpsl_icu_load_fuzzer_SOURCES = libpsl_load_fuzzer.c main.c fuzzer.h
+  libpsl_icu_load_dafsa_fuzzer_SOURCES = libpsl_load_dafsa_fuzzer.c main.c fuzzer.h
+  PSL_TESTS = \
+   libpsl_icu_fuzzer$(EXEEXT) \
+   libpsl_icu_load_fuzzer$(EXEEXT) \
+   libpsl_icu_load_dafsa_fuzzer$(EXEEXT)
+else
+if WITH_LIBIDN2
+  XLIBS = $(LIBIDN2_LIBS)
+  XTYPE = _idn2
+  libpsl_idn2_fuzzer_SOURCES = libpsl_fuzzer.c main.c fuzzer.h
+  libpsl_idn2_load_fuzzer_SOURCES = libpsl_load_fuzzer.c main.c fuzzer.h
+  libpsl_idn2_load_dafsa_fuzzer_SOURCES = libpsl_load_dafsa_fuzzer.c main.c fuzzer.h
+  PSL_TESTS = \
+   libpsl_idn2_fuzzer$(EXEEXT) \
+   libpsl_idn2_load_fuzzer$(EXEEXT) \
+   libpsl_idn2_load_dafsa_fuzzer$(EXEEXT)
+else
+if WITH_LIBIDN
+  XLIBS = $(LIBIDN_LIBS)
+  XTYPE = _idn
+  libpsl_idn_fuzzer_SOURCES = libpsl_fuzzer.c main.c fuzzer.h
+  libpsl_idn_load_fuzzer_SOURCES = libpsl_load_fuzzer.c main.c fuzzer.h
+  libpsl_idn_load_dafsa_fuzzer_SOURCES = libpsl_load_dafsa_fuzzer.c main.c fuzzer.h
+  PSL_TESTS = \
+   libpsl_idn_fuzzer$(EXEEXT) \
+   libpsl_idn_load_fuzzer$(EXEEXT) \
+   libpsl_idn_load_dafsa_fuzzer$(EXEEXT)
+else
+  XLIBS =
+  XTYPE =
+  libpsl_fuzzer_SOURCES = libpsl_fuzzer.c main.c fuzzer.h
+  libpsl_load_fuzzer_SOURCES = libpsl_load_fuzzer.c main.c fuzzer.h
+  libpsl_load_dafsa_fuzzer_SOURCES = libpsl_load_dafsa_fuzzer.c main.c fuzzer.h
+  PSL_TESTS = \
+   libpsl_fuzzer$(EXEEXT) \
+   libpsl_load_fuzzer$(EXEEXT) \
+   libpsl_load_dafsa_fuzzer$(EXEEXT)
+endif
+endif
+endif
 
 check_PROGRAMS = $(PSL_TESTS)
 
-libpsl_fuzzer_SOURCES = libpsl_fuzzer.c main.c fuzzer.h
-libpsl_load_fuzzer_SOURCES = libpsl_load_fuzzer.c main.c fuzzer.h
-libpsl_load_dafsa_fuzzer_SOURCES = libpsl_load_dafsa_fuzzer.c main.c fuzzer.h
-
 dist-hook:
 	find . -name '*.options' -exec cp -v '{}' $(distdir) ';'
 	find . -name '*.dict' -exec cp -v '{}' $(distdir) ';'
@@ -25,27 +62,11 @@ TESTS_ENVIRONMENT = TESTS_VALGRIND="@VALGRIND_ENVIRONMENT@"
 TESTS = $(PSL_TESTS)
 
 clean-local:
-	rm -rf *.gc?? *.log lcov coverage.info
+	rm -rf *.gc?? *.log lcov coverage.info *_fuzzer *.o
 
 fuzz-coverage: $(PSL_TESTS)
 	find . -name '*_fuzzer' -exec ./coverage.sh '{}' ';'
 
-if WITH_LIBICU
-  XLIBS = $(LIBICU_LIBS)
-  XTYPE = _icu
-endif
-if WITH_LIBIDN2
-  XLIBS = -lidn2 -lunistring
-  XTYPE = _idn2
-endif
-if WITH_LIBIDN
-  XLIBS = -lidn -lunistring
-  XTYPE = _idn
-endif
-XLIBS ?=
-XTYPE ?=
-
-
 CXX ?= clang-5.0
 CXXFLAGS ?= $(CFLAGS)