From 7e8ee687e2b0a3b8c43dae4d307766f3f797daae Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 16 Dec 2004 22:24:31 +0000 Subject: [PATCH] make clean misses files on two different targets --- dtool/pptempl/Template.gmsvc.pp | 6 ++++-- dtool/pptempl/Template.nmake.pp | 6 +++--- dtool/pptempl/Template.unix.pp | 6 ++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dtool/pptempl/Template.gmsvc.pp b/dtool/pptempl/Template.gmsvc.pp index fb9a70787a..6fb3f1f123 100644 --- a/dtool/pptempl/Template.gmsvc.pp +++ b/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 diff --git a/dtool/pptempl/Template.nmake.pp b/dtool/pptempl/Template.nmake.pp index 2824323147..652c65bb19 100644 --- a/dtool/pptempl/Template.nmake.pp +++ b/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] diff --git a/dtool/pptempl/Template.unix.pp b/dtool/pptempl/Template.unix.pp index 8d5b77d289..f840d1edd3 100644 --- a/dtool/pptempl/Template.unix.pp +++ b/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