From 6b986090d954dbac91bbb3c43ce7c3328c91a780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email>
Date: Mon, 20 Apr 2020 20:33:51 +0200
Subject: New upstream version 6.9.5

---
 harnesses/makefile | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

(limited to 'harnesses/makefile')

diff --git a/harnesses/makefile b/harnesses/makefile
index dfd84de..b324295 100644
--- a/harnesses/makefile
+++ b/harnesses/makefile
@@ -1,54 +1,53 @@
 # makefile for harness
 SRC = ../src
 CFLAGS   = -I$(SRC) -Wall -g -fsanitize=fuzzer,address -fno-omit-frame-pointer
-CFLAGS_M = -I$(SRC) -Wall -g -fsanitize=fuzzer-no-link,address -fno-omit-frame-pointer -DWITH_READ_MAIN
+CFLAGS_M = -I$(SRC) -Wall -g -fsanitize=fuzzer-no-link,address -fno-omit-frame-pointer -DSTANDALONE
 ONIG_LIB = $(SRC)/.libs/libonig.a
 LIBS     = $(ONIG_LIB)
 
-TARGETS = encode-libfuzzer syntax-libfuzzer \
-          utf16-be-libfuzzer utf16-le-libfuzzer main-encode main-syntax \
-          main-utf16-be main-utf16-le main-regset regset-libfuzzer
+TARGETS = fuzzer-encode fuzzer-syntax fuzzer-utf16-be fuzzer-utf16-le \
+          fuzzer-regset \
+          read-encode read-syntax read-utf16-be read-utf16-le read-regset
 
-OTHER_TARGETS = libfuzzer-onig libfuzzer-onig-full \
-          deluxe-encode-libfuzzer main-deluxe-encode
+OTHER_TARGETS = libfuzzer-onig libfuzzer-onig-full fuzzer-deluxe read-deluxe
 
 
 default: $(TARGETS)
 
-encode-libfuzzer: encode-harness.c $(ONIG_LIB)
+fuzzer-encode: base.c $(ONIG_LIB)
 	clang $(CFLAGS) $< $(LIBS) -o $@
 
-syntax-libfuzzer: encode-harness.c $(ONIG_LIB)
+fuzzer-syntax: base.c $(ONIG_LIB)
 	clang -DSYNTAX_TEST $(CFLAGS) $< $(LIBS) -o $@
 
-deluxe-encode-libfuzzer: deluxe-encode-harness.c $(ONIG_LIB)
+fuzzer-deluxe: deluxe.c $(ONIG_LIB)
 	clang $(CFLAGS) $< $(LIBS) -o $@
 
-utf16-be-libfuzzer: encode-harness.c $(ONIG_LIB)
+fuzzer-utf16-be: base.c $(ONIG_LIB)
 	clang -DUTF16_BE $(CFLAGS) $< $(LIBS) -o $@
 
-utf16-le-libfuzzer: encode-harness.c $(ONIG_LIB)
+fuzzer-utf16-le: base.c $(ONIG_LIB)
 	clang -DUTF16_LE $(CFLAGS) $< $(LIBS) -o $@
 
-regset-libfuzzer: regset-harness.c $(ONIG_LIB)
+fuzzer-regset: regset.c $(ONIG_LIB)
 	clang $(CFLAGS) $< $(LIBS) -o $@
 
-main-encode: encode-harness.c $(ONIG_LIB)
+read-encode: base.c $(ONIG_LIB)
 	clang $(CFLAGS_M) $< $(LIBS) -o $@
 
-main-syntax: encode-harness.c $(ONIG_LIB)
+read-syntax: base.c $(ONIG_LIB)
 	clang -DSYNTAX_TEST $(CFLAGS_M) $< $(LIBS) -o $@
 
-main-deluxe-encode: deluxe-encode-harness.c $(ONIG_LIB)
+read-deluxe: deluxe.c $(ONIG_LIB)
 	clang $(CFLAGS_M) $< $(LIBS) -o $@
 
-main-utf16-be: encode-harness.c $(ONIG_LIB)
+read-utf16-be: base.c $(ONIG_LIB)
 	clang -DUTF16_BE $(CFLAGS_M) $< $(LIBS) -o $@
 
-main-utf16-le: encode-harness.c $(ONIG_LIB)
+read-utf16-le: base.c $(ONIG_LIB)
 	clang -DUTF16_LE $(CFLAGS_M) $< $(LIBS) -o $@
 
-main-regset: regset-harness.c $(ONIG_LIB)
+read-regset: regset.c $(ONIG_LIB)
 	clang $(CFLAGS_M) $< $(LIBS) -o $@
 
 libfuzzer-onig: libfuzzer-onig.cpp $(ONIG_LIB)
-- 
cgit v1.2.3