Make "scons clean" remove config files for ffmpeg, x264, xvidcore. Also

replace tabs with spaces.

1 files changed, 46 insertions, 41 deletions

diff --git a/SConstruct b/SConstruct
index 6ff4ef62ea6..650e58c3536 100644
--- a/SConstruct
+++ b/SConstruct
@@ -178,20 +178,20 @@ if env['BF_NO_ELBEEM'] == 1:
     env['CCFLAGS'].append('-DDISABLE_ELBEEM')
 
 if env['WITH_BF_OPENMP'] == 1:
-	if env['OURPLATFORM']=='win32-vc':
-		env['CCFLAGS'].append('/openmp')
-		env['CPPFLAGS'].append('/openmp')
-		env['CXXFLAGS'].append('/openmp')
-	else:
-		if env['CC'] == 'icc':
-			env.Append(LINKFLAGS=['-openmp', '-static-intel'])
-			env['CCFLAGS'].append('-openmp')
-			env['CPPFLAGS'].append('-openmp')
-			env['CXXFLAGS'].append('-openmp')
-		else:
-			env['CCFLAGS'].append('-fopenmp')
-			env['CPPFLAGS'].append('-fopenmp')
-			env['CXXFLAGS'].append('-fopenmp')
+        if env['OURPLATFORM']=='win32-vc':
+                env['CCFLAGS'].append('/openmp')
+                env['CPPFLAGS'].append('/openmp')
+                env['CXXFLAGS'].append('/openmp')
+        else:
+            if env['CC'] == 'icc':
+                env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+                env['CCFLAGS'].append('-openmp')
+                env['CPPFLAGS'].append('-openmp')
+                env['CXXFLAGS'].append('-openmp')
+            else:
+                env['CCFLAGS'].append('-fopenmp')
+                env['CPPFLAGS'].append('-fopenmp')
+                env['CXXFLAGS'].append('-fopenmp')
 
 #check for additional debug libnames
 
@@ -267,6 +267,11 @@ if not quickie and do_clean:
             if os.path.isdir(B.root_build_dir + dir) == 1:
                 print "clean dir %s"%(B.root_build_dir+dir)
                 shutil.rmtree(B.root_build_dir+dir)
+        for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
+                'extern/xvidcore/build/generic/platform.inc']:
+            if os.path.exists(confile):
+                print "clean file %s"%confile
+                os.remove(confile)
         print B.bc.OKGREEN+'...done'+B.bc.ENDC
     else:
         print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
@@ -355,30 +360,30 @@ dottargetlist = []
 scriptinstall = []
 
 if  env['OURPLATFORM']!='darwin':
-	for dp, dn, df in os.walk('bin/.blender'):
-	    if 'CVS' in dn:
-	        dn.remove('CVS')
-	    if '.svn' in dn:
-	        dn.remove('.svn')
-	    for f in df:
-	        dotblendlist.append(dp+os.sep+f)
-	        dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
-
-	dotblenderinstall = []
-	for targetdir,srcfile in zip(dottargetlist, dotblendlist):
-	    td, tf = os.path.split(targetdir)
-	    dotblenderinstall.append(env.Install(dir=td, source=srcfile))
-	
-	#-- .blender/scripts	
-	scriptpath='release/scripts'
-	for dp, dn, df in os.walk(scriptpath):
-	    if 'CVS' in dn:
-	        dn.remove('CVS')
-	    if '.svn' in dn:
-	        dn.remove('.svn')
-	    dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
-	    source=[dp+os.sep+f for f in df]
-	    scriptinstall.append(env.Install(dir=dir,source=source))
+        for dp, dn, df in os.walk('bin/.blender'):
+            if 'CVS' in dn:
+                dn.remove('CVS')
+            if '.svn' in dn:
+                dn.remove('.svn')
+            for f in df:
+                dotblendlist.append(dp+os.sep+f)
+                dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f)
+
+        dotblenderinstall = []
+        for targetdir,srcfile in zip(dottargetlist, dotblendlist):
+            td, tf = os.path.split(targetdir)
+            dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+        
+        #-- .blender/scripts    
+        scriptpath='release/scripts'
+        for dp, dn, df in os.walk(scriptpath):
+            if 'CVS' in dn:
+                dn.remove('CVS')
+            if '.svn' in dn:
+                dn.remove('.svn')
+            dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):]
+            source=[dp+os.sep+f for f in df]
+            scriptinstall.append(env.Install(dir=dir,source=source))
 
 #-- plugins
 pluglist = []
@@ -410,9 +415,9 @@ for tp, tn, tf in os.walk('release/text'):
 textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
 
 if  env['OURPLATFORM']=='darwin':
-	allinstall = [blenderinstall, plugininstall, textinstall]
+        allinstall = [blenderinstall, plugininstall, textinstall]
 else:
-	allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
+        allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
     dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
@@ -466,7 +471,7 @@ Depends(nsiscmd, allinstall)
 Default(B.program_list)
 
 if not env['WITHOUT_BF_INSTALL']:
-	Default(installtarget)
+        Default(installtarget)
 
 #------------ RELEASE
 # TODO: zipup the installation