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 <glogow@fbihome.de>

vcl/Executable_602fuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,602fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,602fuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,602fuzzer,\

vcl/Executable_bmpfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,bmpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,bmpfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,bmpfuzzer,\

vcl/Executable_cgmfuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,cgmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,cgmfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,cgmfuzzer,\

vcl/Executable_dbffuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,dbffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,dbffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,dbffuzzer,\

vcl/Executable_diffuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,diffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,diffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,diffuzzer,\

vcl/Executable_docxfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,docxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,docxfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_writer \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,docxfuzzer,\

vcl/Executable_dxffuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,dxffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,dxffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,dxffuzzer,\

vcl/Executable_epsfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,epsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,epsfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,epsfuzzer,\

vcl/Executable_fodpfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,fodpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,fodpfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_draw \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,fodpfuzzer,\

vcl/Executable_fodsfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,fodsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,fodsfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,fodsfuzzer,\

vcl/Executable_fodtfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,fodtfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,fodtfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_writer \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,fodtfuzzer,\

vcl/Executable_giffuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,giffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,giffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,giffuzzer,\

vcl/Executable_htmlfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,htmlfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,htmlfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_writer \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,htmlfuzzer,\

vcl/Executable_hwpfuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,hwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,hwpfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,hwpfuzzer,\

vcl/Executable_jpgfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,jpgfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,jpgfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,jpgfuzzer,\

vcl/Executable_lwpfuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,lwpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,lwpfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,lwpfuzzer,\

vcl/Executable_metfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,metfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,metfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,metfuzzer,\

vcl/Executable_mmlfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,mmlfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,mmlfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_math \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,mmlfuzzer,\

vcl/Executable_mtpfuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,mtpfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,mtpfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,mtpfuzzer,\

vcl/Executable_olefuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,olefuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,olefuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,olefuzzer,\

vcl/Executable_pcdfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pcdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pcdfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pcdfuzzer,\

vcl/Executable_pctfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pctfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pctfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pctfuzzer,\

vcl/Executable_pcxfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pcxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pcxfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pcxfuzzer,\

vcl/Executable_pngfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,pngfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pngfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pngfuzzer,\

vcl/Executable_ppmfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,ppmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ppmfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ppmfuzzer,\

vcl/Executable_pptfuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,pptfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pptfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pptfuzzer,\

vcl/Executable_pptxfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,pptxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,pptxfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_draw \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,pptxfuzzer,\

vcl/Executable_psdfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,psdfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,psdfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,psdfuzzer,\

vcl/Executable_qpwfuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,qpwfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,qpwfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,qpwfuzzer,\

vcl/Executable_rasfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,rasfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,rasfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rasfuzzer,\

vcl/Executable_rtffuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,rtffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,rtffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,rtffuzzer,\

vcl/Executable_scrtffuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,scrtffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,scrtffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,scrtffuzzer,\

vcl/Executable_sftfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,sftfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,sftfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,sftfuzzer,\

vcl/Executable_slkfuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,slkfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,slkfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,slkfuzzer,\

vcl/Executable_svmfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,svmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,svmfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,svmfuzzer,\

vcl/Executable_tgafuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,tgafuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,tgafuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tgafuzzer,\

vcl/Executable_tiffuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,tiffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,tiffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,tiffuzzer,\

vcl/Executable_wksfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,wksfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,wksfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,wksfuzzer,\

vcl/Executable_wmffuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,wmffuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,wmffuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,wmffuzzer,\

vcl/Executable_ww2fuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,ww2fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww2fuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww2fuzzer,\

vcl/Executable_ww6fuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,ww6fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww6fuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww6fuzzer,\

vcl/Executable_ww8fuzzer.mk

@@ -32,9 +32,7 @@ $(eval $(call gb_Executable_use_libraries,ww8fuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,ww8fuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,ww8fuzzer,\

vcl/Executable_xbmfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,xbmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xbmfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xbmfuzzer,\

vcl/Executable_xlsfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,xlsfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xlsfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xlsfuzzer,\

vcl/Executable_xlsxfuzzer.mk

@@ -33,10 +33,8 @@ $(eval $(call gb_Executable_use_libraries,xlsxfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xlsxfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
     fuzzer_calc \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xlsxfuzzer,\

vcl/Executable_xpmfuzzer.mk

@@ -31,9 +31,7 @@ $(eval $(call gb_Executable_use_libraries,xpmfuzzer,\
 ))
 
 $(eval $(call gb_Executable_use_static_libraries,xpmfuzzer,\
-    findsofficepath \
+    $(fuzzer_statics) \
-    ulingu \
-    fuzzerstubs \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,xpmfuzzer,\

vcl/commonfuzzer.mk

@@ -42,6 +42,11 @@ fuzzer_externals = \
     hunspell \
     zlib \
 
+fuzzer_statics = \
+     findsofficepath \
+     fuzzerstubs \
+     ulingu \
+
 fuzzer_core_libraries = \
     avmedia \
     basegfx \