make clean misses files on two different targets

dtool/pptempl/Template.gmsvc.pp

@@ -217,9 +217,11 @@ all : $[all_targets]
 test : $[test_bin_targets] $[test_lib_targets]
 
 clean : clean-igate
-#if $[st_sources]
-$[TAB] rm -f $[patsubst %,$[%_obj],$[st_sources]]
+#forscopes metalib_target lib_target noinst_lib_target static_lib_target ss_lib_target bin_target noinst_bin_target test_bin_target test_lib_target
+#if $[compile_sources]
+$[TAB] rm -f $[patsubst %,$[%_obj],$[compile_sources]]
 #endif
+#end metalib_target lib_target noinst_lib_target static_lib_target ss_lib_target bin_target noinst_bin_target test_bin_target test_lib_target
 #if $[deferred_objs]
 $[TAB] rm -f $[deferred_objs]
 #endif

dtool/pptempl/Template.nmake.pp

@@ -218,11 +218,11 @@ all : $[patsubst %,$[osfilename %],$[all_targets]]
 test : $[patsubst %,$[osfilename %],$[test_bin_targets] $[test_lib_targets]]
 
 clean : clean-igate
-#if $[st_sources]
-#foreach file $[patsubst %,$[osfilename $[%_obj]],$[st_sources]]
+#forscopes metalib_target lib_target noinst_lib_target static_lib_target ss_lib_target bin_target noinst_bin_target test_bin_target test_lib_target
+#foreach file $[patsubst %,$[osfilename $[%_obj]],$[compile_sources]]
 $[TAB] if exist $[file] del /f $[file]
 #end file
-#endif
+#end metalib_target lib_target noinst_lib_target static_lib_target ss_lib_target bin_target noinst_bin_target test_bin_target test_lib_target
 #if $[deferred_objs]
  #foreach file $[patsubst %,$[osfilename %],$[deferred_objs]]
 $[TAB] if exist $[file] del /f $[file]

dtool/pptempl/Template.unix.pp

@@ -192,9 +192,11 @@ all : $[all_targets]
 test : $[test_bin_targets]
 
 clean : clean-igate
-#if $[st_sources]
-$[TAB] rm -f $[patsubst %,$[%_obj],$[st_sources]]
+#forscopes metalib_target lib_target noinst_lib_target static_lib_target ss_lib_target bin_target noinst_bin_target test_bin_target test_lib_target
+#if $[compile_sources]
+$[TAB] rm -f $[patsubst %,$[%_obj],$[compile_sources]]
 #endif
+#end metalib_target lib_target noinst_lib_target static_lib_target ss_lib_target bin_target noinst_bin_target test_bin_target test_lib_target
 #if $[lib_targets] $[static_lib_targets] $[bin_targets] $[test_bin_targets]
 $[TAB] rm -f $[lib_targets] $[static_lib_targets] $[bin_targets] $[test_bin_targets]
 #endif