config: set defaults for prefix sources and cache in the config

4 files changed, 0 insertions, 28 deletions

diff --git a/config/android.config b/config/android.config
index 03c347b..a61c98b 100644
--- a/config/android.config
+++ b/config/android.config
@@ -7,9 +7,6 @@ import os
 from cerbero.config import Architecture, DistroVersion
 
 if target_arch == Architecture.ARM or target_arch == Architecture.ARMv7:
-    prefix=prefix or os.path.expanduser('~/cerbero/dist/android_arm')
-    sources=sources or os.path.expanduser('~/cerbero/sources/android_arm')
-    cache_file= cache_file or 'android_arm'
     tools_prefix = 'arm-linux-androideabi'
 else:
   raise FatalError("Arch not supported")
diff --git a/config/darwin.config b/config/darwin.config
index cbadf70..4a1cbaa 100644
--- a/config/darwin.config
+++ b/config/darwin.config
@@ -12,24 +12,12 @@ allow_system_libs=False
 
 if target_arch == Architecture.X86_64:
     build='x86_64-apple-darwinx'
-    prefix=prefix or os.path.expanduser('~/cerbero/dist/osx_x86_64')
-    sources=sources or os.path.expanduser('~/cerbero/sources/osx_x86_64')
-    cache_file= cache_file or 'osx_x86_64'
 elif target_arch == Architecture.X86:
     build='i386-apple-darwinx'
-    prefix=prefix or os.path.expanduser('~/cerbero/dist/osx_i386')
-    sources=sources or os.path.expanduser('~/cerbero/sources/osx_i386')
-    cache_file= cache_file or 'osx_i386'
 elif target_arch == Architecture.PPC:
     build='powerpc-apple-darwinx'
-    prefix=prefix or os.path.expanduser('~/cerbero/dist/osx_ppc')
-    sources=sources or os.path.expanduser('~/cerbero/sources/osx_ppc')
-    cache_file= cache_file or 'osx_ppc'
 elif target_arch == Architecture.UNIVERSAL:
     build='universal-apple-darwinx'
-    prefix=prefix or os.path.expanduser('~/cerbero/dist/universal')
-    sources=sources or os.path.expanduser('~/cerbero/sources/universal')
-    cache_file= cache_file or 'osx_universal'
 
 if distro_version == DistroVersion.OS_X_LEOPARD:
     # autotools in OSX 10.5 (Leopard) are a bit oldy/broken.
diff --git a/config/linux.config b/config/linux.config
index 25d3f49..2a808ce 100644
--- a/config/linux.config
+++ b/config/linux.config
@@ -6,15 +6,6 @@
 import os
 from cerbero.config import Architecture
 
-if target_arch == Architecture.X86_64:
-    prefix=prefix or os.path.expanduser('~/cerbero/dist/linux_x86_64')
-    sources=sources or os.path.expanduser('~/cerbero/sources/linux_x86_64')
-    cache_file= cache_file or 'linux_x86_64'
-elif target_arch == Architecture.X86:
-    prefix=prefix or os.path.expanduser('~/cerbero/dist/linux_i686')
-    sources=sources or os.path.expanduser('~/cerbero/sources/linux_i686')
-    cache_file=cache_file or 'linux_i686'
-
 for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'LDFLAGS', 'OBJCFLAGS']:
     os.environ[f] = os.environ.get(f, '')
 
diff --git a/config/windows.config b/config/windows.config
index 17d9b40..3071081 100644
--- a/config/windows.config
+++ b/config/windows.config
@@ -30,10 +30,6 @@ else:
 
 target = host
 
-prefix=prefix or os.path.expanduser('~/cerbero/dist/%s' % buildname)
-sources=sources or os.path.expanduser('~/cerbero/sources/%s' % buildname)
-cache_file = cache_file or buildname
-
 py_prefix='lib/python2.7'
 
 if not toolchain_prefix: