vcl/Executable_602fuzzer.mk   |    4 +---
 vcl/Executable_bmpfuzzer.mk   |    4 +---
 vcl/Executable_cgmfuzzer.mk   |    4 +---
 vcl/Executable_dbffuzzer.mk   |    4 +---
 vcl/Executable_diffuzzer.mk   |    4 +---
 vcl/Executable_docxfuzzer.mk  |    4 +---
 vcl/Executable_dxffuzzer.mk   |    4 +---
 vcl/Executable_epsfuzzer.mk   |    4 +---
 vcl/Executable_fodpfuzzer.mk  |    4 +---
 vcl/Executable_fodsfuzzer.mk  |    4 +---
 vcl/Executable_fodtfuzzer.mk  |    4 +---
 vcl/Executable_giffuzzer.mk   |    4 +---
 vcl/Executable_htmlfuzzer.mk  |    4 +---
 vcl/Executable_hwpfuzzer.mk   |    4 +---
 vcl/Executable_jpgfuzzer.mk   |    4 +---
 vcl/Executable_lwpfuzzer.mk   |    4 +---
 vcl/Executable_metfuzzer.mk   |    4 +---
 vcl/Executable_mmlfuzzer.mk   |    4 +---
 vcl/Executable_mtpfuzzer.mk   |    4 +---
 vcl/Executable_olefuzzer.mk   |    4 +---
 vcl/Executable_pcdfuzzer.mk   |    4 +---
 vcl/Executable_pctfuzzer.mk   |    4 +---
 vcl/Executable_pcxfuzzer.mk   |    4 +---
 vcl/Executable_pngfuzzer.mk   |    4 +---
 vcl/Executable_ppmfuzzer.mk   |    4 +---
 vcl/Executable_pptfuzzer.mk   |    4 +---
 vcl/Executable_pptxfuzzer.mk  |    4 +---
 vcl/Executable_psdfuzzer.mk   |    4 +---
 vcl/Executable_qpwfuzzer.mk   |    4 +---
 vcl/Executable_rasfuzzer.mk   |    4 +---
 vcl/Executable_rtffuzzer.mk   |    4 +---
 vcl/Executable_scrtffuzzer.mk |    4 +---
 vcl/Executable_sftfuzzer.mk   |    4 +---
 vcl/Executable_slkfuzzer.mk   |    4 +---
 vcl/Executable_svmfuzzer.mk   |    4 +---
 vcl/Executable_tgafuzzer.mk   |    4 +---
 vcl/Executable_tiffuzzer.mk   |    4 +---
 vcl/Executable_wksfuzzer.mk   |    4 +---
 vcl/Executable_wmffuzzer.mk   |    4 +---
 vcl/Executable_ww2fuzzer.mk   |    4 +---
 vcl/Executable_ww6fuzzer.mk   |    4 +---
 vcl/Executable_ww8fuzzer.mk   |    4 +---
 vcl/Executable_xbmfuzzer.mk   |    4 +---
 vcl/Executable_xlsfuzzer.mk   |    4 +---
 vcl/Executable_xlsxfuzzer.mk  |    4 +---
 vcl/Executable_xpmfuzzer.mk   |    4 +---
 vcl/commonfuzzer.mk           |    5 +++++
 47 files changed, 51 insertions(+), 138 deletions(-)

New commits:
commit c70271ca5ba26718cfbc621d08c53acb5e1da4b4
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Dec 25 12:11:15 2021 +0100
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sat Dec 25 15:24:51 2021 +0100

    oss-fuzz: use fuzzer_statics for default statics
    
    Change-Id: I3616507127e0661635d87ba2b949ddaa13bc898d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127454
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>

diff --git a/vcl/Executable_602fuzzer.mk b/vcl/Executable_602fuzzer.mk
index 7ad15e87e3be..633e536a41aa 100644
--- a/vcl/Executable_602fuzzer.mk
+++ b/vcl/Executable_602fuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,602fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,602fuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,602fuzzer,\
diff --git a/vcl/Executable_bmpfuzzer.mk b/vcl/Executable_bmpfuzzer.mk
index 783bbe66e3c6..64e132ad5464 100644
--- a/vcl/Executable_bmpfuzzer.mk
+++ b/vcl/Executable_bmpfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,bmpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,bmpfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,bmpfuzzer,\
diff --git a/vcl/Executable_cgmfuzzer.mk b/vcl/Executable_cgmfuzzer.mk
index dcfab5d515c4..074f18fa4b1c 100644
--- a/vcl/Executable_cgmfuzzer.mk
+++ b/vcl/Executable_cgmfuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,cgmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,cgmfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,cgmfuzzer,\
diff --git a/vcl/Executable_dbffuzzer.mk b/vcl/Executable_dbffuzzer.mk
index 72478ee2e2ec..64de9072cdcf 100644
--- a/vcl/Executable_dbffuzzer.mk
+++ b/vcl/Executable_dbffuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,dbffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,dbffuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,dbffuzzer,\
diff --git a/vcl/Executable_diffuzzer.mk b/vcl/Executable_diffuzzer.mk
index b9ca63b07b0c..349a41696076 100644
--- a/vcl/Executable_diffuzzer.mk
+++ b/vcl/Executable_diffuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,diffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,diffuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,diffuzzer,\
diff --git a/vcl/Executable_docxfuzzer.mk b/vcl/Executable_docxfuzzer.mk
index e33baa829017..fbacbe92fd98 100644
--- a/vcl/Executable_docxfuzzer.mk
+++ b/vcl/Executable_docxfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,docxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,docxfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_writer \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,docxfuzzer,\
diff --git a/vcl/Executable_dxffuzzer.mk b/vcl/Executable_dxffuzzer.mk
index 74b46e1abec6..efbbe5fff9ec 100644
--- a/vcl/Executable_dxffuzzer.mk
+++ b/vcl/Executable_dxffuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,dxffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,dxffuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,dxffuzzer,\
diff --git a/vcl/Executable_epsfuzzer.mk b/vcl/Executable_epsfuzzer.mk
index 1ac4b3df7b25..c900dd2579dd 100644
--- a/vcl/Executable_epsfuzzer.mk
+++ b/vcl/Executable_epsfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,epsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,epsfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,epsfuzzer,\
diff --git a/vcl/Executable_fodpfuzzer.mk b/vcl/Executable_fodpfuzzer.mk
index ead31bf7d985..aa84e71e6a58 100644
--- a/vcl/Executable_fodpfuzzer.mk
+++ b/vcl/Executable_fodpfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,fodpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,fodpfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_draw \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,fodpfuzzer,\
diff --git a/vcl/Executable_fodsfuzzer.mk b/vcl/Executable_fodsfuzzer.mk
index 6c13ba174dc4..b4aa966b5402 100644
--- a/vcl/Executable_fodsfuzzer.mk
+++ b/vcl/Executable_fodsfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,fodsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,fodsfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,fodsfuzzer,\
diff --git a/vcl/Executable_fodtfuzzer.mk b/vcl/Executable_fodtfuzzer.mk
index 3e832e23f154..94a15362cbd4 100644
--- a/vcl/Executable_fodtfuzzer.mk
+++ b/vcl/Executable_fodtfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,fodtfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,fodtfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_writer \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,fodtfuzzer,\
diff --git a/vcl/Executable_giffuzzer.mk b/vcl/Executable_giffuzzer.mk
index d6aa7d402fb2..89757046df8b 100644
--- a/vcl/Executable_giffuzzer.mk
+++ b/vcl/Executable_giffuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,giffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,giffuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,giffuzzer,\
diff --git a/vcl/Executable_htmlfuzzer.mk b/vcl/Executable_htmlfuzzer.mk
index cbdfb5bc7aff..33a567a4c417 100644
--- a/vcl/Executable_htmlfuzzer.mk
+++ b/vcl/Executable_htmlfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,htmlfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,htmlfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_writer \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,htmlfuzzer,\
diff --git a/vcl/Executable_hwpfuzzer.mk b/vcl/Executable_hwpfuzzer.mk
index 60d36644212e..1157ba0f0b10 100644
--- a/vcl/Executable_hwpfuzzer.mk
+++ b/vcl/Executable_hwpfuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,hwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,hwpfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,hwpfuzzer,\
diff --git a/vcl/Executable_jpgfuzzer.mk b/vcl/Executable_jpgfuzzer.mk
index 72de88d93f3a..748b6dff93a1 100644
--- a/vcl/Executable_jpgfuzzer.mk
+++ b/vcl/Executable_jpgfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,jpgfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,jpgfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,jpgfuzzer,\
diff --git a/vcl/Executable_lwpfuzzer.mk b/vcl/Executable_lwpfuzzer.mk
index fb2573060657..c1d68df433b0 100644
--- a/vcl/Executable_lwpfuzzer.mk
+++ b/vcl/Executable_lwpfuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,lwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,lwpfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,lwpfuzzer,\
diff --git a/vcl/Executable_metfuzzer.mk b/vcl/Executable_metfuzzer.mk
index b3b0096fa8d2..442a20e8633e 100644
--- a/vcl/Executable_metfuzzer.mk
+++ b/vcl/Executable_metfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,metfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,metfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,metfuzzer,\
diff --git a/vcl/Executable_mmlfuzzer.mk b/vcl/Executable_mmlfuzzer.mk
index 71083c1a08b9..e2b2b8596a98 100644
--- a/vcl/Executable_mmlfuzzer.mk
+++ b/vcl/Executable_mmlfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,mmlfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,mmlfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_math \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,mmlfuzzer,\
diff --git a/vcl/Executable_mtpfuzzer.mk b/vcl/Executable_mtpfuzzer.mk
index 719861776f29..c16857fcdc34 100644
--- a/vcl/Executable_mtpfuzzer.mk
+++ b/vcl/Executable_mtpfuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,mtpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,mtpfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,mtpfuzzer,\
diff --git a/vcl/Executable_olefuzzer.mk b/vcl/Executable_olefuzzer.mk
index f8704e4eb2a1..f19604550f50 100644
--- a/vcl/Executable_olefuzzer.mk
+++ b/vcl/Executable_olefuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,olefuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,olefuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,olefuzzer,\
diff --git a/vcl/Executable_pcdfuzzer.mk b/vcl/Executable_pcdfuzzer.mk
index bb93f53f545b..a53db763269e 100644
--- a/vcl/Executable_pcdfuzzer.mk
+++ b/vcl/Executable_pcdfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pcdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pcdfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pcdfuzzer,\
diff --git a/vcl/Executable_pctfuzzer.mk b/vcl/Executable_pctfuzzer.mk
index 7584f3aa294c..66b62d8e19e3 100644
--- a/vcl/Executable_pctfuzzer.mk
+++ b/vcl/Executable_pctfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pctfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pctfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pctfuzzer,\
diff --git a/vcl/Executable_pcxfuzzer.mk b/vcl/Executable_pcxfuzzer.mk
index db78be216744..868321c726f4 100644
--- a/vcl/Executable_pcxfuzzer.mk
+++ b/vcl/Executable_pcxfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pcxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pcxfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pcxfuzzer,\
diff --git a/vcl/Executable_pngfuzzer.mk b/vcl/Executable_pngfuzzer.mk
index 2b4c3e66c9c3..682f02102aad 100644
--- a/vcl/Executable_pngfuzzer.mk
+++ b/vcl/Executable_pngfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pngfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pngfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pngfuzzer,\
diff --git a/vcl/Executable_ppmfuzzer.mk b/vcl/Executable_ppmfuzzer.mk
index 1f627529315b..a6d1850d6009 100644
--- a/vcl/Executable_ppmfuzzer.mk
+++ b/vcl/Executable_ppmfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,ppmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ppmfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ppmfuzzer,\
diff --git a/vcl/Executable_pptfuzzer.mk b/vcl/Executable_pptfuzzer.mk
index 70bf67281234..bdb4c39f8a0b 100644
--- a/vcl/Executable_pptfuzzer.mk
+++ b/vcl/Executable_pptfuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,pptfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pptfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pptfuzzer,\
diff --git a/vcl/Executable_pptxfuzzer.mk b/vcl/Executable_pptxfuzzer.mk
index 389570a8cdd7..83aa65d80036 100644
--- a/vcl/Executable_pptxfuzzer.mk
+++ b/vcl/Executable_pptxfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,pptxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pptxfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_draw \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pptxfuzzer,\
diff --git a/vcl/Executable_psdfuzzer.mk b/vcl/Executable_psdfuzzer.mk
index 5c4cc28206d5..995b0410e9a7 100644
--- a/vcl/Executable_psdfuzzer.mk
+++ b/vcl/Executable_psdfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,psdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,psdfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,psdfuzzer,\
diff --git a/vcl/Executable_qpwfuzzer.mk b/vcl/Executable_qpwfuzzer.mk
index 5b5a3c4b2ed7..d5de32b867a8 100644
--- a/vcl/Executable_qpwfuzzer.mk
+++ b/vcl/Executable_qpwfuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,qpwfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,qpwfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,qpwfuzzer,\
diff --git a/vcl/Executable_rasfuzzer.mk b/vcl/Executable_rasfuzzer.mk
index 540e40122b8b..a0b8fd21c7ab 100644
--- a/vcl/Executable_rasfuzzer.mk
+++ b/vcl/Executable_rasfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,rasfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,rasfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rasfuzzer,\
diff --git a/vcl/Executable_rtffuzzer.mk b/vcl/Executable_rtffuzzer.mk
index df486a6b50bf..c5c05a8eb66a 100644
--- a/vcl/Executable_rtffuzzer.mk
+++ b/vcl/Executable_rtffuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,rtffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,rtffuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rtffuzzer,\
diff --git a/vcl/Executable_scrtffuzzer.mk b/vcl/Executable_scrtffuzzer.mk
index 153c622a9702..984644c204d2 100644
--- a/vcl/Executable_scrtffuzzer.mk
+++ b/vcl/Executable_scrtffuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,scrtffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,scrtffuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,scrtffuzzer,\
diff --git a/vcl/Executable_sftfuzzer.mk b/vcl/Executable_sftfuzzer.mk
index 97a4f541aff2..41781d024e77 100644
--- a/vcl/Executable_sftfuzzer.mk
+++ b/vcl/Executable_sftfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,sftfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,sftfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,sftfuzzer,\
diff --git a/vcl/Executable_slkfuzzer.mk b/vcl/Executable_slkfuzzer.mk
index 1cf375d728cc..75d44fec3477 100644
--- a/vcl/Executable_slkfuzzer.mk
+++ b/vcl/Executable_slkfuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,slkfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,slkfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,slkfuzzer,\
diff --git a/vcl/Executable_svmfuzzer.mk b/vcl/Executable_svmfuzzer.mk
index 2fadeacf97a8..7c54dbd1b0ea 100644
--- a/vcl/Executable_svmfuzzer.mk
+++ b/vcl/Executable_svmfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,svmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,svmfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,svmfuzzer,\
diff --git a/vcl/Executable_tgafuzzer.mk b/vcl/Executable_tgafuzzer.mk
index d9fd3db345b9..f42142b1852c 100644
--- a/vcl/Executable_tgafuzzer.mk
+++ b/vcl/Executable_tgafuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,tgafuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,tgafuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tgafuzzer,\
diff --git a/vcl/Executable_tiffuzzer.mk b/vcl/Executable_tiffuzzer.mk
index 79bb4ad2c8f5..fdba17a02d0e 100644
--- a/vcl/Executable_tiffuzzer.mk
+++ b/vcl/Executable_tiffuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,tiffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,tiffuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tiffuzzer,\
diff --git a/vcl/Executable_wksfuzzer.mk b/vcl/Executable_wksfuzzer.mk
index 0f90ff382921..0728f5f14d56 100644
--- a/vcl/Executable_wksfuzzer.mk
+++ b/vcl/Executable_wksfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,wksfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,wksfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,wksfuzzer,\
diff --git a/vcl/Executable_wmffuzzer.mk b/vcl/Executable_wmffuzzer.mk
index 4adfc5bbd5f2..5da2cdfaeebd 100644
--- a/vcl/Executable_wmffuzzer.mk
+++ b/vcl/Executable_wmffuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,wmffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,wmffuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,wmffuzzer,\
diff --git a/vcl/Executable_ww2fuzzer.mk b/vcl/Executable_ww2fuzzer.mk
index ac113f18409f..8bb3ec0528fa 100644
--- a/vcl/Executable_ww2fuzzer.mk
+++ b/vcl/Executable_ww2fuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,ww2fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww2fuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww2fuzzer,\
diff --git a/vcl/Executable_ww6fuzzer.mk b/vcl/Executable_ww6fuzzer.mk
index a07ead015502..527e63346040 100644
--- a/vcl/Executable_ww6fuzzer.mk
+++ b/vcl/Executable_ww6fuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,ww6fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww6fuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww6fuzzer,\
diff --git a/vcl/Executable_ww8fuzzer.mk b/vcl/Executable_ww8fuzzer.mk
index 43de2f90a9a4..b604f6be45e4 100644
--- a/vcl/Executable_ww8fuzzer.mk
+++ b/vcl/Executable_ww8fuzzer.mk
@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,ww8fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww8fuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww8fuzzer,\
diff --git a/vcl/Executable_xbmfuzzer.mk b/vcl/Executable_xbmfuzzer.mk
index 0c22f5b88e49..484250c9f897 100644
--- a/vcl/Executable_xbmfuzzer.mk
+++ b/vcl/Executable_xbmfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,xbmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xbmfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xbmfuzzer,\
diff --git a/vcl/Executable_xlsfuzzer.mk b/vcl/Executable_xlsfuzzer.mk
index 99ac73b9acf7..496bac2475fe 100644
--- a/vcl/Executable_xlsfuzzer.mk
+++ b/vcl/Executable_xlsfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,xlsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xlsfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xlsfuzzer,\
diff --git a/vcl/Executable_xlsxfuzzer.mk b/vcl/Executable_xlsxfuzzer.mk
index 715c144d8ccf..60bbe467dd43 100644
--- a/vcl/Executable_xlsxfuzzer.mk
+++ b/vcl/Executable_xlsxfuzzer.mk
@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,xlsxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xlsxfuzzer,\
-    findsofficepath \
-    ulingu \
+    $(fuzzer_statics) \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xlsxfuzzer,\
diff --git a/vcl/Executable_xpmfuzzer.mk b/vcl/Executable_xpmfuzzer.mk
index 785762f84a0a..402c53bb6e89 100644
--- a/vcl/Executable_xpmfuzzer.mk
+++ b/vcl/Executable_xpmfuzzer.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,xpmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xpmfuzzer,\
-    findsofficepath \
-    ulingu \
-    fuzzerstubs \
+    $(fuzzer_statics) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xpmfuzzer,\
diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk
index 8ec331286613..968bb6e8eb75 100644
--- a/vcl/commonfuzzer.mk
+++ b/vcl/commonfuzzer.mk
@@ -42,6 +42,11 @@ fuzzer_externals = \
     hunspell \
     zlib \
 
+fuzzer_statics = \
+     findsofficepath \
+     fuzzerstubs \
+     ulingu \
+
 fuzzer_core_libraries = \
     avmedia \
     basegfx \

Reply via email to