[gpsd-dev] [PATCH] Fix the carnivorous config bug

[Christian Gagneraud]

This should fix the "carnivorous config bug", scons -c used to delete
".sconf_temp" but keep other scons' temporary files, this patch fix scons
behaviour to act like the good all autotools way:
make clean => scons -c
make distclean => scons -c distclean

Signed-off-by: Christian Gagneraud <address@hidden>
---
 SConstruct | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index 050b61b..95d477d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1268,10 +1268,13 @@ build = env.Alias('build', [libraries, binaries, 
python_built_extensions, "gpsd.
 env.Clean(build,
           map(glob.glob,("*.[oa]", "*.os", "*.os.*", "*.gcno", "*.pyc", 
"gps/*.pyc")) + \
           generated_sources + \
-          map(lambda f: f[:-3], templated) + \
-          [".sconf_temp"])
+          map(lambda f: f[:-3], templated))
 env.Default(*build)
 
+## "make distclean" => "scons -c distclean"
+env.Clean("distclean",
+          [".sconf_temp", ".scons-option-cache", ".sconsign.dblite"])
+
 if qt_env:
     build_qt = qt_env.Alias('build', [compiled_qgpsmmlib])
     qt_env.Default(*build_qt)
-- 
1.8.4