diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common
index 3cfcc909d9..4f904aac1e 100644
--- a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common
+++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/MG5aMC_patches/PROD/patch.common
@@ -12,31 +12,6 @@ index a59181c70..af7e0efbc 100644
        INTEGER MAXTRIES
        PARAMETER(MAXTRIES=25)
  C     To pass the helicity configuration chosen by the DiscreteSampler to 
-diff --git b/epochX/cudacpp/gg_tt.mad/Source/makefile a/epochX/cudacpp/gg_tt.mad/Source/makefile
-index 617f10b93..00c73099a 100644
---- b/epochX/cudacpp/gg_tt.mad/Source/makefile
-+++ a/epochX/cudacpp/gg_tt.mad/Source/makefile
-@@ -120,7 +120,7 @@ $(LIBDIR)libiregi.a: $(IREGIDIR)
- 	cd $(IREGIDIR); make
- 	ln -sf ../Source/$(IREGIDIR)libiregi.a $(LIBDIR)libiregi.a
- 
--clean:
-+cleanSource:
- 	$(RM) *.o $(LIBRARIES) $(BINARIES)
- 	cd PDF; make clean; cd ..
- 	cd PDF/gammaUPC; make clean; cd ../../
-@@ -132,4 +132,11 @@ clean:
- 	cd BIAS/ptj_bias; make clean; cd ../..
- 	if [ -d $(CUTTOOLSDIR) ]; then cd $(CUTTOOLSDIR); make clean; cd ..; fi
- 	if [ -d $(IREGIDIR) ]; then cd $(IREGIDIR); make clean; cd ..; fi
-+
-+clean: cleanSource
- 	for i in `ls -d ../SubProcesses/P*`; do cd $$i; make clean; cd -; done;
-+
-+cleanavx:
-+	for i in `ls -d ../SubProcesses/P*`; do cd $$i; make cleanavxs; cd -; done;
-+cleanall: cleanSource # THIS IS THE ONE
-+	for i in `ls -d ../SubProcesses/P*`; do cd $$i; make cleanavxs; cd -; done;
 diff --git b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile a/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
 index 348c283be..6a21300f7 100644
 --- b/epochX/cudacpp/gg_tt.mad/SubProcesses/makefile
diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/madevent_makefile_source_addon b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/madevent_makefile_source_addon
new file mode 100644
index 0000000000..d24c74721a
--- /dev/null
+++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/madgraph/iolibs/template_files/madevent_makefile_source_addon
@@ -0,0 +1,6 @@
+
+cleanavx:
+	for i in `ls -d ../SubProcesses/P*`; do cd $$i; make cleanavxs; cd -; done;
+cleanall: clean # THIS IS THE ONE
+	for i in `ls -d ../SubProcesses/P*`; do cd $$i; make cleanavxs; cd -; done;
+
diff --git a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/output.py b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/output.py
index b1a9b9aff8..6402f32bbb 100644
--- a/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/output.py
+++ b/epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/output.py
@@ -30,7 +30,7 @@
 # AV - create a plugin-specific logger
 import logging
 logger = logging.getLogger('madgraph.PLUGIN.CUDACPP_OUTPUT.output')
-
+from madgraph import MG5DIR
 #------------------------------------------------------------------------------------
 
 from os.path import join as pjoin
@@ -191,6 +191,23 @@ def copy_template(self, model):
                 makefile_test = self.read_template_file(self.template_tst_make) % {'model': self.get_model_name(model.get('name'))}
                 open(os.path.join('test', 'cudacpp_test.mk'), 'w').write(makefile_test)
 
+    def write_source_makefile(self, writer, default=None):
+
+        if default:
+            replace_dict = default
+        else:
+            raise Exception('primary exporter should have been run first')
+        
+        path = pjoin(PLUGINDIR , 'madgraph', 'iolibs', 'template_files', 'madevent_makefile_source_addon') 
+        replace_dict['additional_dependencies'] += open(path).read()  
+
+        if writer:
+            path = pjoin(MG5DIR, 'madgraph', 'iolibs','template_files','madevent_makefile_source')
+            text = open(path).read() % replace_dict
+            writer.write(text)
+        
+
+
     # AV - add debug printouts (in addition to the default one from OM's tutorial)
     def generate_subprocess_directory(self, subproc_group, fortran_model, me=None):
         misc.sprint('Entering PLUGIN_ProcessExporter.generate_subprocess_directory (create the directory)')