scons build systems
authorKen Hughes <khughes@pacific.edu>
Mon, 8 Mar 2010 20:37:45 +0000 (20:37 +0000)
committerKen Hughes <khughes@pacific.edu>
Mon, 8 Mar 2010 20:37:45 +0000 (20:37 +0000)
-------------------
Revert inadvertent ffmpeg changes.

SConstruct

index ae2c92ef218b8072e1783e5d13d24ebb22873bed..30d8788f040936311e892937c4da87d9a4187c15 100644 (file)
@@ -335,17 +335,19 @@ if not quickie and do_clean:
                        else: # remove file
                                print "remove file %s"%(B.root_build_dir+entry)
                                os.remove(B.root_build_dir+entry)
-       for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
-                       'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']:
-               if os.path.exists(confile):
-                       print "clean file %s"%confile
-                       if os.path.isdir(confile):
-                               for root, dirs, files in os.walk(confile):
-                                       for name in files:
-                                               os.remove(os.path.join(root, name))
-                       else:
-                               os.remove(confile)
-       print B.bc.OKGREEN+'...done'+B.bc.ENDC
+               for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak',
+                               'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']:
+                       if os.path.exists(confile):
+                               print "clean file %s"%confile
+                               if os.path.isdir(confile):
+                                       for root, dirs, files in os.walk(confile):
+                                               for name in files:
+                                                       os.remove(os.path.join(root, name))
+                               else:
+                                       os.remove(confile)
+               print B.bc.OKGREEN+'...done'+B.bc.ENDC
+       else:
+               print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
        Exit()
 
 if not os.path.isdir ( B.root_build_dir):