List files in recipes

65 files changed, 380 insertions, 137 deletions

diff --git a/cerbero/packages/package.py b/cerbero/packages/package.py
index bf1005f1..11a5d545 100644
--- a/cerbero/packages/package.py
+++ b/cerbero/packages/package.py
@@ -59,97 +59,34 @@ class Package(PackageBase):
     Describes a set of files to produce disctribution packages for the different
     target platforms
 
-    @cvar libraries: list of libraries
-    @type libraries: list
-    @cvar platform_libs: list of platform dependant libraries
-    @type platform_libs: dict
-    @cvar binaries: list of binaries
-    @type binaries: list
-    @cvar platform_bins: list of platform dependant binaries
-    @type platform_bins: dict
-    @cvar files: list of files included in this package
-    @type type: files
-    @cvar platform_files: list of files included for a specific platform
-    @type type: dict
     @cvar deps: list of packages dependencies
     @type deps: list
-
-    @ivar extensions: file extensions for binaries and shared libraries
-    @type bext: dict
+    @cvar files: list of files included in this package
+    @type files: list
     '''
 
-    libraries = list()
-    platform_libs = {}
-    binaries = list()
-    platform_bins = {}
-    files = list()
-    platform_files = {}
     deps = list()
 
-    EXTENSIONS = {
-        Platform.WINDOWS: {'bext': '.exe', 'sext': '.dll', 'sdir': 'bin'},
-        Platform.LINUX: {'bext': '', 'sext': '.so', 'sdir': 'lib'},
-        Platform.DARWIN: {'bext': '', 'sext': '.dylib', 'sdir': 'lib'}}
-
-    def __init__(self, config):
-        self.config = config
-        self.extensions = self.EXTENSIONS[self.config.target_platform]
-
-    def get_files_list(self):
-        files = []
-        files.extend(self._get_files())
-        files.extend(self._get_binaries())
-        files.extend(self._get_libraries())
-        return sorted(files)
-
-    def _get_files(self):
-        # Fille the list of regular files
-        files = []
-        files.extend(self.files)
-        if self.config.target_platform in self.platform_files:
-            files.extend(self.platform_files[self.config.target_platform])
-        return [f % self.extensions for f in files]
+    def __init__(self, config, cookbook):
+        self.cookbook = cookbook
+        self._files.extend = self.platform_files.get(config.target_platform, [])
+        self._parse_files()
 
-    def _get_binaries(self):
+    def recipes_dependencies(self):
+        return [x.split(':')[0] for x in self._files]
+    
+    def files_list(self):
         files = []
-        # Fill the list of binaries
-        binaries = []
-        binaries.extend(self.binaries)
-        if self.config.target_platform in self.platform_bins:
-            binaries.extend(self.platform_bins[self.config.target_platform])
-        for f in binaries:
-            self.extensions['file'] = f
-            files.append('bin/%(file)s%(bext)s' % self.extensions)
+        for recipe, categories in self._recipes_files:
+            rfiles = self.cookbook.get_recipe(recipe).files_list(categories)
+            files.extend(rfiles)
         return files
 
-    def _get_libraries(self):
-        # Fill the list of binaries
-        # Unfortunately the filename might vary depending on the platform and we
-        # need to match the library name and it's extension with the list of
-        # files in the prefix
-        libraries = []
-        libraries.extend(self.libraries)
-        if self.config.target_platform in self.platform_libs:
-            libraries.extend(self.platform_libs[self.config.target_platform])
-        if len(libraries) == 0:
-            return []
-
-        pattern = '%(sdir)s/%(file)s*%(sext)s'
-        if self.config.target_platform == Platform.LINUX:
-            # libfoo.so.X, libfoo.so.X.Y.Z
-            pattern += '.*'
-
-        libsmatch = []
-        for f in libraries:
-            self.extensions['file'] = f
-            libsmatch.append(pattern % self.extensions)
-        # FIXME: I think's that's the fastest way of getting the list of
-        # libraries that matches the library name
-        sfiles = shell.check_call('ls %s' % ' '.join(libsmatch),
-                                 self.config.prefix, True, False, False).split('\n')
-        sfiles.remove('')
-        # remove duplicates
-        return list(set(sfiles))
+    def _parse_files(self):
+        self._recipes_files = {}
+        for r in self.files:
+            l = r.split(':')
+            self._recipes_files[l[0]] = l[1:]
 
 
 class MetaPackage(PackageBase):
@@ -160,12 +97,9 @@ class MetaPackage(PackageBase):
     @type packages: list
     @cvar icon: filename of the package icon
     @type icon: str
-    @cvar install_dir: dictionary with the installation paths for all platforms
-    @type install_dir: str
     '''
 
     icon = None
-    install_dir = {}
     packages = []
 
     def __init__(self, config):
diff --git a/packages/base-system.package b/packages/base-system.package
index 70b0b34a..d0a0279f 100644
--- a/packages/base-system.package
+++ b/packages/base-system.package
@@ -11,41 +11,11 @@ class Package(package.Package):
     vendor = 'GStreamer Project'
     uuid = '3ffe67c2-4565-411f-8287-e8faa892f853'
 
-    libraries = ['libcairo',
-                 'libcairo-gobject',
-                 'libcairo-script-interpreter',
-                 'libdbus',
-                 'libexpat',
-                 'libffi',
-                 'libfontconfig',
-                 'libfreetype',
-                 'libgio-2.0',
-                 'libglib-2.0',
-                 'libgmodule-2.0',
-                 'libgobject-2.0',
-                 'libgthread-2.0',
-                 'liborc-0.4',
-                 'libpango-1.0',
-                 'libpangocairo-1.0',
-                 'libpangoft2-1.0',
-                 'libpng15',
-                 'libtiff',
-                 'libxml2',
-                 'libz']
+    files = ['cairo:libs', 'dbus:libs', 'expat:libs', 'fontconfig:libs',
+            'freetype:libs', 'glib:libs', 'orc:libs', 'pango:libs',
+            'png:libs', 'tiff:libs', 'xml2:libs', 'zlib:libs']
 
-    platform_libs = {
-        Platform.LINUX: ['libpangox-1.0'],
-
-        Platform.WINDOWS: ['libasprintf',
-                           'libcharset',
-                           'libiconv',
-                           'libintl',
-                           'libpangowin32-1.0',
-                           'libpixman-1-0'],
-
-        Platform.DARWIN: ['libasprintf',
-                          'libcharset',
-                          'libiconv',
-                           'libintl',
-                           'libpangox-1.0',
-                           'libpixman-1-0']}
+    platform_files = {
+        Platform.WINDOWS: ['gettext:libs'],
+        Platform.DARWIN: ['gettext:libs']
+        }
diff --git a/recipes/a52dec.recipe b/recipes/a52dec.recipe
index 98398cb7..e4d8c35c 100644
--- a/recipes/a52dec.recipe
+++ b/recipes/a52dec.recipe
@@ -4,3 +4,8 @@ class Recipe(recipe.Recipe):
     name = 'a52dec'
     version = '0.7.4'
     configure_options = '--with-pic'
+    license = 'GPLv2'
+
+    files_libs = ['liba52']
+    files_bins = ['a52dec']
+    files_devel = ['include/a52dec']
diff --git a/recipes/atk.recipe b/recipes/atk.recipe
index fcab5f2d..3976d45b 100644
--- a/recipes/atk.recipe
+++ b/recipes/atk.recipe
@@ -5,3 +5,7 @@ class Recipe(recipe.Recipe):
     name = 'atk'
     version = '2.2.0'
     deps = ['glib']
+    license = 'LGPLv2'
+
+    files_libs = ['atk']
+    files_devel = ['lib/pkgconfig/atk.pc', 'include/atk-1.0']
diff --git a/recipes/bzip2.recipe b/recipes/bzip2.recipe
index b49c25a3..7e2c883d 100644
--- a/recipes/bzip2.recipe
+++ b/recipes/bzip2.recipe
@@ -4,6 +4,11 @@
 class Recipe(recipe.Recipe):
     name = 'bzip2'
     version = '1.0.6'
+    license = 'BSD-like'
+
+    files_libs = ['libbz2']
+    files_devel = ['include/bzlib.h']
+
 
     def prepare (self):
         self._remove_steps(['configure'])
diff --git a/recipes/cairo.recipe b/recipes/cairo.recipe
index 379202d3..415dd3c6 100644
--- a/recipes/cairo.recipe
+++ b/recipes/cairo.recipe
@@ -5,3 +5,22 @@ class Recipe(recipe.Recipe):
     name = 'cairo'
     version = '1.10.2'
     deps = ['glib', 'libpng', 'zlib', 'pixman', 'fontconfig', 'freetype']
+    license = 'LGPLv2.1'
+
+    files_libs = ['libcairo', 'libcairo-gobject', 'libcairo-script-interpreter']
+    files_devel = [
+        'lib/pkgconfig/cairo-fc.pc',
+        'lib/pkgconfig/cairo.pc',
+        'lib/pkgconfig/cairo-ps.pc',
+        'lib/pkgconfig/cairo-win32.pc',
+        'lib/pkgconfig/cairo-ft.pc',
+        'lib/pkgconfig/cairo-pdf.pc',
+        'lib/pkgconfig/cairo-svg.pc',
+        'lib/pkgconfig/pangocairo.pc',
+        'lib/pkgconfig/cairo-gobject.pc',
+        'lib/pkgconfig/cairo-png.pc',
+        'include/cairo',
+        ]
+    files_devel_platform = {
+        Platform.WINDOWS: ['lib/pkgconfig/cairo-win32-font.pc']
+    }
diff --git a/recipes/clutter-gst.recipe b/recipes/clutter-gst.recipe
index 3c2653e8..248f283c 100644
--- a/recipes/clutter-gst.recipe
+++ b/recipes/clutter-gst.recipe
@@ -6,3 +6,6 @@ class Recipe(recipe.Recipe):
     deps = ['clutter', 'gstreamer', 'gst-plugins-base']
     use_system_libs = True
     autoreconf = True
+
+    files_libs = ['libclutter-gst-1.0']
+    files_devel = ['lib/pkgconfig/clutter-gst.pc', 'include/clutter-1.0/clutter-gst']
diff --git a/recipes/clutter.recipe b/recipes/clutter.recipe
index f3b8e754..e168babb 100644
--- a/recipes/clutter.recipe
+++ b/recipes/clutter.recipe
@@ -5,6 +5,23 @@ class Recipe(recipe.Recipe):
     version = '1.8.4'
     deps = ['json-glib', 'cairo', 'atk', 'pango', 'cogl']
     use_system_libs = True
+    license = 'LGPLv2.1'
+
+    files_devel = [
+        'lib/pkgconfig/cluter-1.0.pc',
+        'include/clutter-1.0/clutter',
+    ]
+    files_libs_platform = {
+        Platform.WINDOWS: ['libclutter-win32-1.0'],
+        Platform.DARWIN: ['libclutter-osx-1.0'],
+        Platform.LINUX: ['libclutter-x11-1.0'],
+    }
+    files_devel_platform = {
+        Platform.WINDOWS: ['lib/pkgconfig/clutter-win32-1.0.pc'],
+        Platform.DARWIN: ['lib/pkgconfig/clutter-osx-1.0.pc'],
+        Platform.LINUX: ['lib/pkgconfig/clutter-x11-1.0.pc'],
+    }
+
 
     def prepare(self):
         if self.config.target_platform == Platform.DARWIN:
diff --git a/recipes/cogl.recipe b/recipes/cogl.recipe
index 13ec1f54..4397cf0e 100644
--- a/recipes/cogl.recipe
+++ b/recipes/cogl.recipe
@@ -5,3 +5,12 @@ class Recipe(recipe.Recipe):
     version = '1.8.2'
     use_system_libs = True
     deps = [ 'gdk-pixbuf' ]
+    license = 'LGPLv2.1'
+
+    files_libs = ['libcogl', 'libcogl-pango'],
+    files_devel = [
+        'lib/pkgconfig/cogl-gl-1.0.pc',
+        'lib/pkgconfig/cogl-1.0.pc',
+        'lib/pkgconfig/cogl-pango-1.0.pc',
+        'include/cogl',
+        ]
diff --git a/recipes/dbus.recipe b/recipes/dbus.recipe
index d9703257..788a7ab2 100644
--- a/recipes/dbus.recipe
+++ b/recipes/dbus.recipe
@@ -3,5 +3,10 @@
 class Recipe(recipe.Recipe):
     name = 'dbus'
     version = '1.4.16'
+    license = 'AFLv2.1'
     deps = ['expat']
     configure_options = '--disable-xml-docs --disable-doxygen-docs --disable-selinux --disable-libaudit --disable-launchd --disable-tests --disable-x11-autolaunch --disable-Werror '
+
+    files_libs = ['libdbus']
+    files_bins = ['dbus-launch', 'dbus-send', 'dbus-daemon', 'dbus-monitor']
+    files_devel = ['lib/pkgconfig/dbus-1.0.pc', 'include/dbus-1.0']
diff --git a/recipes/expat.recipe b/recipes/expat.recipe
index edfe6a5c..cc5aba73 100644
--- a/recipes/expat.recipe
+++ b/recipes/expat.recipe
@@ -4,3 +4,7 @@
 class Recipe(recipe.Recipe):
     name = 'expat'
     version = '2.1.0'
+    license = 'BSD-like'
+
+    files_libs = ['libexpat']
+    files_devel = ['include/expat.h', 'include/expat_external.h']
diff --git a/recipes/faad2.recipe b/recipes/faad2.recipe
index 9dac6e1b..a391e29f 100644
--- a/recipes/faad2.recipe
+++ b/recipes/faad2.recipe
@@ -3,3 +3,8 @@
 class Recipe(recipe.Recipe):
     name = 'faad2'
     version = '2.7'
+    license = 'GPLv2'
+
+    files_libs = ['libfaad']
+    files_bin = ['faad']
+    files_devel = ['include/faad.h']
diff --git a/recipes/flac.recipe b/recipes/flac.recipe
index bc805cac..81c20c28 100644
--- a/recipes/flac.recipe
+++ b/recipes/flac.recipe
@@ -5,8 +5,18 @@ class Recipe(recipe.Recipe):
     name = 'flac'
     version = '1.2.1'
     config_sh = 'sh autogen.sh'
+    license = 'BSD' # only libraries, tools are GPL
     platform_deps = { Platform.WINDOWS: ['libiconv'] }
 
+    files_libs = ['libFLAC', 'libFLAC++']
+    files_bin = ['flac', 'metaflac']
+    files_devel = [
+        'lib/pkgconfig/flac.pc',
+        'lib/pkgconfig/flac++.pc',
+        'include/FLAC',
+        'include/FLAC++',
+    ]
+
     def prepare(self):
         if self.config.target_platform == Platform.DARWIN:
             if self.config.target_arch == Architecture.X86:
diff --git a/recipes/fontconfig.recipe b/recipes/fontconfig.recipe
index 1c772785..8625535c 100644
--- a/recipes/fontconfig.recipe
+++ b/recipes/fontconfig.recipe
@@ -4,9 +4,13 @@
 class Recipe(recipe.Recipe):
     name = 'fontconfig'
     version = '2.8.0'
+    license = 'MIT'
     deps = ['expat', 'freetype', 'zlib']
     platform_deps = { Platform.WINDOWS: ['libiconv'] }
 
+    files_libs = ['libfontconfig']
+    files_devel = ['lib/pkgconfig/fontconfig.pc', 'include/fontconfig']
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             if self.config.target_arch == Architecture.X86_64:
diff --git a/recipes/freetype.recipe b/recipes/freetype.recipe
index 943a00c1..9507a303 100644
--- a/recipes/freetype.recipe
+++ b/recipes/freetype.recipe
@@ -4,5 +4,10 @@
 class Recipe(recipe.Recipe):
     name = 'freetype'
     version = '2.4.8'
+    license = 'FreeType'
     configure_tpl = "%(config-sh)s --prefix=%(prefix)s"
     force_configure = True
+
+    files_libs = ['libfreetype']
+    files_bin = ['freetype-config']
+    files_devel = ['lib/pkgconfig/freetype2.pc', 'include/freetype2']
diff --git a/recipes/fribidi.recipe b/recipes/fribidi.recipe
index 80160630..fa192e24 100644
--- a/recipes/fribidi.recipe
+++ b/recipes/fribidi.recipe
@@ -3,3 +3,8 @@
 class Recipe(recipe.Recipe):
     name = 'fribidi'
     version = '0.19.2'
+    license = 'LGPLv2.1'
+
+    files_libs = ['libfribidi']
+    files_bin = ['fribidi']
+    files_devel = ['lib/pkgconfig/fribidi.pc', 'include/fribidi']
diff --git a/recipes/gdk-pixbuf.recipe b/recipes/gdk-pixbuf.recipe
index 5eecc6f7..2ff0ecda 100644
--- a/recipes/gdk-pixbuf.recipe
+++ b/recipes/gdk-pixbuf.recipe
@@ -4,8 +4,17 @@
 class Recipe(recipe.Recipe):
     name = 'gdk-pixbuf'
     version = '2.24.1'
+    license = 'LGPLv2.1'
     deps = ['jpeg', 'glib', 'libpng', 'tiff', 'zlib' ]
 
+    files_libs = ['libgdk_pixbuf']
+    files_bin = ['gdk-pixbuf-query-loaders', 'gdk-pixbuf-csource']
+    files_devel = [
+        'lib/gdk-pixbuf-2.0',
+        'lib/pkgconfig/gdk-pixbuf-2.0.pc',
+        'include/gdk-pixbuf-2.0',
+    ]
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.autoreconf = True
diff --git a/recipes/gettext.recipe b/recipes/gettext.recipe
index c8d238bd..b2c95fd3 100644
--- a/recipes/gettext.recipe
+++ b/recipes/gettext.recipe
@@ -6,6 +6,11 @@ class Recipe(recipe.Recipe):
     version = '0.18.1.1'
     srcdir = 'gettext-runtime'
     autoreconf = True
+    license = 'LGPL'
+
+    files_libs = ['libintl', 'libasnprintf']
+    files_bins = ['gettext', 'ngettext', 'envsubst']
+    files_devel = ['include/autosnprintf.h']
 
     def prepare (self):
         if self.config.target_platform == Platform.WINDOWS:
diff --git a/recipes/glib-networking.recipe b/recipes/glib-networking.recipe
index 9e983000..f6f2953d 100644
--- a/recipes/glib-networking.recipe
+++ b/recipes/glib-networking.recipe
@@ -4,5 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'glib-networking'
     version = '2.30.2'
+    license = 'LGPLv2'
     configure_options = "--without-ca-certificates"
     deps = ['glib', 'gnutls']
+
+    files_libs = ['lib/gio/modules/libgiognutls%(sext)s']
diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index 2f1b6c73..0182d7bd 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -3,11 +3,32 @@
 class Recipe(recipe.Recipe):
     name = 'glib'
     version = '2.30.3'
+    license = 'LGPLv2'
     configure_sh = 'sh autogen.sh'
     deps = ['libffi', 'zlib']
     platform_deps = {Platform.WINDOWS: ['libiconv', 'gettext'],
                      Platform.DARWIN: ['libiconv', 'gettext']}
 
+    files_libs = [
+        'libglib-2.0', 'libgio-2.0', 'libgmodule-2.0', 'libgobject-2.0',
+        'libgthread-2.0']
+    files_bins = [
+        'glib-gettextize', 'glib-mkenums', 'glib-compile-schemas',
+        'glib-genmarshal']
+    files_dev = [
+        'lib/gio'
+        'lib/glib-2.0/include/glibconfig.h',
+        'lib/pkgconfig/gio-2.0.pc',
+        'lib/pkgconfig/glib-2.0.pc',
+        'lib/pkgconfig/gmodule-2.0.pc',
+        'lib/pkgconfig/gobject-2.0.pc',
+        'lib/pkgconfig/gthread-2.0.pc',
+        'include/glib-2.0']
+    files_dev_platform = {
+        Platform.WINDOWS: ['lib/pkgconfig/gio-windows-2.0.pc', 'include/gio-win32-2.0'],
+    }
+
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options = '--with-libiconv=gnu'
diff --git a/recipes/gmp.recipe b/recipes/gmp.recipe
index 28a45051..3648183d 100644
--- a/recipes/gmp.recipe
+++ b/recipes/gmp.recipe
@@ -4,6 +4,10 @@
 class Recipe(recipe.Recipe):
     name = 'gmp'
     version = '5.0.4'
+    license = 'LGPL'
+
+    files_libs = ['libgmp', 'libgmpxx']
+    files_devel = ['include/gmp.h', 'include/gmpxx.h']
 
     def prepare(self):
         # --enable-cxx must be set to enable a proper detection of the link system
diff --git a/recipes/gnutls.recipe b/recipes/gnutls.recipe
index 7e5bd743..9b952447 100644
--- a/recipes/gnutls.recipe
+++ b/recipes/gnutls.recipe
@@ -4,9 +4,14 @@
 class Recipe(recipe.Recipe):
     name = 'gnutls'
     version = '3.0.14'
+    license = 'LGPLv2.1+'
     configure_options = "--enable-local-libopts "
     deps = ['zlib', 'nettle', 'libgcrypt', 'libtasn1']
 
+    files_libs = ['libgnutls', 'libgnutlsxx', 'libgnutls-openssl']
+    files_bins = ['gnutls-cli', 'gnutls-serv', 'gnutls-cli-debug']
+    files_devel = ['lib/pkgconfig/gnutls.pc', 'include/gnutls']
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options += ' --enable-threads=win32'
diff --git a/recipes/gst-ffmpeg-static.recipe b/recipes/gst-ffmpeg-static.recipe
index 7082da29..e0c66b1b 100644
--- a/recipes/gst-ffmpeg-static.recipe
+++ b/recipes/gst-ffmpeg-static.recipe
@@ -1,7 +1,5 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
-import os
-
 class Recipe(recipe.Recipe):
     name = 'gst-ffmpeg-static'
     version = '0.10.13'
diff --git a/recipes/gst-plugins-bad-static.recipe b/recipes/gst-plugins-bad-static.recipe
index 2075c4f3..6d0caad5 100644
--- a/recipes/gst-plugins-bad-static.recipe
+++ b/recipes/gst-plugins-bad-static.recipe
@@ -1,7 +1,5 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
-import os
-
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-bad-static'
     version = '0.10.23'
diff --git a/recipes/gst-plugins-base-static.recipe b/recipes/gst-plugins-base-static.recipe
index 21c50045..84f5d900 100644
--- a/recipes/gst-plugins-base-static.recipe
+++ b/recipes/gst-plugins-base-static.recipe
@@ -1,7 +1,5 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
-import os
-
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-base-static'
     version = '0.10.36'
diff --git a/recipes/gst-plugins-good-static.recipe b/recipes/gst-plugins-good-static.recipe
index e6bfd852..2283c34c 100644
--- a/recipes/gst-plugins-good-static.recipe
+++ b/recipes/gst-plugins-good-static.recipe
@@ -1,7 +1,5 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
-import os
-
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-good-static'
     version = '0.10.31'
diff --git a/recipes/gst-plugins-ugly-static.recipe b/recipes/gst-plugins-ugly-static.recipe
index ca932d54..bbb472ad 100644
--- a/recipes/gst-plugins-ugly-static.recipe
+++ b/recipes/gst-plugins-ugly-static.recipe
@@ -1,7 +1,5 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
-import os
-
 class Recipe(recipe.Recipe):
     name = 'gst-plugins-ugly-static'
     version = '0.10.19'
diff --git a/recipes/gstreamer-static.recipe b/recipes/gstreamer-static.recipe
index e5fa6d8d..e2774bb5 100644
--- a/recipes/gstreamer-static.recipe
+++ b/recipes/gstreamer-static.recipe
@@ -1,7 +1,5 @@
 # -*- Mode: Python -*- vi:si:et:sw=4:sts=4:ts=4:syntax=python
 
-import os
-
 class Recipe(recipe.Recipe):
     name = 'gstreamer-static'
     version = '0.10.36'
diff --git a/recipes/gtk.recipe b/recipes/gtk.recipe
index 621e47b0..3018a8b2 100644
--- a/recipes/gtk.recipe
+++ b/recipes/gtk.recipe
@@ -4,8 +4,28 @@
 class Recipe(recipe.Recipe):
     name = 'gtk+'
     version = '2.24.10'
+    license = 'LGPLv2'
     deps = ['glib', 'atk', 'pango', 'gdk-pixbuf', 'cairo']
 
+    files_bins = [
+        'gtk-demo', 'gtk-update-icon-cache', 'gtk-query-immmodules-2.0',
+        'gtk-builder-convert']
+    files_etc = ['gtkrc']
+    files_devel = [
+        'lib/gtk-2.0'
+        'lib/pkgconfig/gtk+-2.0.pc',
+        'lib/pkgconfig/gdk-2.0.pc',
+        'include/gtk-2.0',
+        'include/gdk-2.0',
+    ]
+    files_bins_platform = {
+        Platform.WINDOWS: ['libgtk-win32-2.0', 'libgdk-win32-2.0'],
+        }
+    files_devel_platform = {
+        Platform.WINDOWS: [
+        'lib/pkgconfig/gtk+-win32-2.0.pc', 'lib/pkgconfig/gdk''win32-2.0.pc'],
+        }
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options += '--disable-papi --disable-cups --with-included-immodules'
diff --git a/recipes/insanity.recipe b/recipes/insanity.recipe
index 63dab6c9..3f599666 100644
--- a/recipes/insanity.recipe
+++ b/recipes/insanity.recipe
@@ -7,4 +7,3 @@ class Recipe(recipe.Recipe):
     configure_options = '--disable-introspection '
     remotes = {'upstream': 'git+ssh://git.keema.collabora.co.uk/git/insanity/insanity.git'}
     deps = [ 'glib', 'gtk-doc', 'dbus' ]
-
diff --git a/recipes/jasper.recipe b/recipes/jasper.recipe
index bf673b0f..ca0de665 100644
--- a/recipes/jasper.recipe
+++ b/recipes/jasper.recipe
@@ -3,6 +3,10 @@
 class Recipe(recipe.Recipe):
     name = 'jasper'
     version = '1.900.1'
+    license = 'Jasper'
     config_sh = 'sh configure'
     configure_options = '--enable-shared '
 
+    files_libs = ['libjasper']
+    files_bins = ['jasper']
+    files_devel = ['include/jasper']
diff --git a/recipes/jpeg.recipe b/recipes/jpeg.recipe
index 2cb2f390..1dde780f 100644
--- a/recipes/jpeg.recipe
+++ b/recipes/jpeg.recipe
@@ -4,3 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'jpeg'
     version = '8d'
+    license = 'JPEG'
+
+    files_libs = ['libjpeg']
+    files_bins = ['cjpeg', 'djpeg', 'jpegtran']
+    files_devel = ['include/jpeglib.h']
diff --git a/recipes/json-glib.recipe b/recipes/json-glib.recipe
index 6b8d086b..d54bd4d5 100644
--- a/recipes/json-glib.recipe
+++ b/recipes/json-glib.recipe
@@ -3,3 +3,7 @@
 class Recipe(recipe.Recipe):
     name = 'json-glib'
     version = '0.12.6'
+    license = 'LGPLv2.1'
+
+    files_libs = ['libjson-glib-1.0']
+    files_devel  = ['include/json-glib-1.0', 'lib/pkgconfig/json-glib-1.0.pc']
diff --git a/recipes/libass.recipe b/recipes/libass.recipe
index 522b7ef1..29f909fd 100644
--- a/recipes/libass.recipe
+++ b/recipes/libass.recipe
@@ -4,4 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'libass'
     version = '0.10.0'
+    license = 'BSD-like'
     deps = ['freetype', 'fontconfig', 'libpng', 'fribidi']
+
+    files_libs = ['libass']
+    files_devel = ['include/ass', 'lib/pkgconfig/libass.pc']
diff --git a/recipes/libdca.recipe b/recipes/libdca.recipe
index 391e71ba..8947f186 100644
--- a/recipes/libdca.recipe
+++ b/recipes/libdca.recipe
@@ -3,3 +3,8 @@
 class Recipe(recipe.Recipe):
     name = 'libdca'
     version = '0.0.5'
+    license = 'GPL'
+
+    files_libs = ['libdca']
+    files_bins = ['extract_dca', 'dcadec']
+    files_devel = ['include/dca.h', 'lib/pkgconfig/libdca.pc']
diff --git a/recipes/libdv.recipe b/recipes/libdv.recipe
index 5eab6f78..6733c5dc 100644
--- a/recipes/libdv.recipe
+++ b/recipes/libdv.recipe
@@ -4,6 +4,11 @@
 class Recipe(recipe.Recipe):
     name = 'libdv'
     version = '1.0.0'
+    license = 'LGPLv2.1'
+
+    files_libs = ['libdv']
+    files_bins = ['dvconnect', 'encodedv', 'dubdv']
+    files_devel = ['include/libdv', 'lib/pkgconfig/libdv.pc']
 
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
diff --git a/recipes/libdvdnav.recipe b/recipes/libdvdnav.recipe
index 3289458e..736c906a 100644
--- a/recipes/libdvdnav.recipe
+++ b/recipes/libdvdnav.recipe
@@ -4,5 +4,10 @@
 class Recipe(recipe.Recipe):
     name = 'libdvdnav'
     version = '4.2.0'
+    license = 'GPLv2'
     config_sh = 'sh autogen.sh'
     deps = ['libdvdread']
+
+    files_libs = ['libdvdnav', 'libdvdnavmini']
+    files_devel = ['include/dvdnav', 'lib/pkgconfig/libdvnav.pc',
+                   'lib/pkgconfig/libdvnavmini.pc', 'bin/dvdnav-config']
diff --git a/recipes/libdvdread.recipe b/recipes/libdvdread.recipe
index 8af1135d..5db468d6 100644
--- a/recipes/libdvdread.recipe
+++ b/recipes/libdvdread.recipe
@@ -4,4 +4,9 @@
 class Recipe(recipe.Recipe):
     name = 'libdvdread'
     version = '4.2.0'
+    license = 'GPLv2'
     config_sh = 'sh autogen.sh'
+
+    files_libs = ['libdvread']
+    files_devel = ['include/dvdread', 'lib/pkgconfig/libdvnav.pc',
+                   'lib/pkgconfig/libdvnavmini.pc', 'bin/dvdread-config']
diff --git a/recipes/libexif.recipe b/recipes/libexif.recipe
index e7070c06..0f11cb98 100644
--- a/recipes/libexif.recipe
+++ b/recipes/libexif.recipe
@@ -4,3 +4,7 @@
 class Recipe(recipe.Recipe):
     name = 'libexif'
     version = '0.6.20'
+    license = 'LGPLv2.1'
+
+    files_libs = ['libexif']
+    files_devel = ['include/libexif', 'lib/pkgconfig/libexif.pc']
diff --git a/recipes/libffi.recipe b/recipes/libffi.recipe
index 43154d9d..0019255b 100644
--- a/recipes/libffi.recipe
+++ b/recipes/libffi.recipe
@@ -4,9 +4,12 @@
 class Recipe(recipe.Recipe):
     name = 'libffi'
     version = '3.0.10'
-    
+    license = 'BSD-like'
+
+    files_libs = ['libffi']
+    files_devel = ['lib/libffi-3.0.10', 'lib/pkgconfig/libffi.pc']
+
     def prepare(self):
-        from cerbero.config import Platform, Architecture
         if self.config.target_platform == Platform.DARWIN:
             if self.config.target_arch == Architecture.X86_64:
                 dir = 'x86_64-apple-darwin*'
@@ -14,6 +17,6 @@ class Recipe(recipe.Recipe):
                 dir = 'i386-apple-darwin*'
             elif self.config.target_arch == Architecture.PPC:
                 dir = 'powerpc-apple-darwin*'
- 
+
             self.make = 'make -C %s' % dir
             self.make_install = 'make -C %s install' % dir
diff --git a/recipes/libgcrypt.recipe b/recipes/libgcrypt.recipe
index 674ff41e..f2edce69 100644
--- a/recipes/libgcrypt.recipe
+++ b/recipes/libgcrypt.recipe
@@ -4,8 +4,12 @@
 class Recipe(recipe.Recipe):
     name = 'libgcrypt'
     version = '1.5.0'
+    license = 'LGPLv2.1'
     deps = ['libgpg-error']
 
+    files_libs = ['libgcrypt']
+    files_devel = ['include/gcrypt.h', 'bin/gcrypt-config']
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             if self.config.target_arch == Architecture.X86_64:
diff --git a/recipes/libgpg-error.recipe b/recipes/libgpg-error.recipe
index da2a8267..482dfb57 100644
--- a/recipes/libgpg-error.recipe
+++ b/recipes/libgpg-error.recipe
@@ -4,3 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'libgpg-error'
     version = '1.10'
+    license = 'LGPLv2.1'
+
+    files_libs = ['libgpg-error']
+    files_bins = ['gpg-error']
+    files_devel = ['include/gpg-eror.h', 'bin/gpg-error-config']
diff --git a/recipes/libmad.recipe b/recipes/libmad.recipe
index 3466ae4b..30a5ea03 100644
--- a/recipes/libmad.recipe
+++ b/recipes/libmad.recipe
@@ -3,3 +3,7 @@
 class Recipe(recipe.Recipe):
     name = 'libmad'
     version = '0.15.1b'
+    license = 'GPLv2'
+
+    files_libs = ['libmad']
+    files_devel = ['include/mad.h']
diff --git a/recipes/libmpeg2.recipe b/recipes/libmpeg2.recipe
index 382691fa..b6a17982 100644
--- a/recipes/libmpeg2.recipe
+++ b/recipes/libmpeg2.recipe
@@ -3,8 +3,14 @@
 class Recipe(recipe.Recipe):
     name = 'libmpeg2'
     version = '0.5.1'
+    license = 'GPLv2'
     autoreconf = True
 
+    files_libs = ['libmpeg2', 'libmpeg2convert']
+    files_bins = ['mpeg2dec', 'extract-mpeg2', 'corrupt_mpeg2']
+    files_devel = ['include/mpeg2dec', 'lib/pkgconfig/libmpeg2.pc',
+                   'lib/pkgconfig/libmpeg2.pc']
+
     def prepare(self):
         if self.config.target_platform in [Platform.WINDOWS, Platform.DARWIN]:
             self.configure_options = ' --disable-sdl'
diff --git a/recipes/libogg.recipe b/recipes/libogg.recipe
index e514d9aa..eb92c0a9 100644
--- a/recipes/libogg.recipe
+++ b/recipes/libogg.recipe
@@ -4,3 +4,7 @@
 class Recipe(recipe.Recipe):
     name = 'libogg'
     version = '1.3.0'
+    license = 'BSD-like'
+
+    files_libs = ['libogg']
+    files_devel = ['include/ogg', 'lib/pkgconfig/ogg.pc']
diff --git a/recipes/libpng.recipe b/recipes/libpng.recipe
index b9719baf..a2c75106 100644
--- a/recipes/libpng.recipe
+++ b/recipes/libpng.recipe
@@ -4,4 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'libpng'
     version = '1.5.8'
+    license = 'LibPNG'
     deps = ['zlib']
+
+    files_libs = ['libpng15']
+    files_devel = ['include/libpng15', 'bin/png-config', 'lib/pkgconfig/libpng15.pc']
diff --git a/recipes/libshout.recipe b/recipes/libshout.recipe
index e938ebd6..57232b59 100644
--- a/recipes/libshout.recipe
+++ b/recipes/libshout.recipe
@@ -4,4 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'libshout'
     version = '2.2.2'
+    license = 'LGPLv2.1'
     deps = ['libtheora', 'libogg', 'libvorbis', 'speex']
+
+    files_libs = ['libshout']
+    files_devel = ['include/shout', 'lib/pkgconfig/shout.pc']
diff --git a/recipes/libsoup.recipe b/recipes/libsoup.recipe
index ef793ed7..c9906b5c 100644
--- a/recipes/libsoup.recipe
+++ b/recipes/libsoup.recipe
@@ -4,9 +4,15 @@
 class Recipe(recipe.Recipe):
     name = 'libsoup'
     version = '2.36.1'
+    license = 'LGPLv2.1'
     configure_options = '--without-gnome'
     deps = ['libxml2', 'glib']
 
+    files_libs = ['libsoup-2.4']
+    files_bins = ['dvconnect', 'encodedv', 'dubdv']
+    files_devel = ['include/libsoup-2.4', 'lib/pkgconfig/libsoup-2.4.pc']
+
+
     def prepare(self):
         if self.config.target_platform != Platform.LINUX or self.config.target_distro_version not in [ DistroVersion.DEBIAN_WHEEZY, DistroVersion.UBUNTU_NATTY, DistroVersion.UBUNTU_ONEIRIC ]:
             self.deps += [ 'glib-networking' ]
diff --git a/recipes/libtasn1.recipe b/recipes/libtasn1.recipe
index 58b41ac2..be03066d 100644
--- a/recipes/libtasn1.recipe
+++ b/recipes/libtasn1.recipe
@@ -3,3 +3,7 @@
 class Recipe(recipe.Recipe):
     name = 'libtasn1'
     version = '2.11'
+    license = 'LGPLv2.1'
+
+    files_libs = ['libtasn1']
+    files_devel = ['include/libtasn1.h', 'lib/pkgconfig/libtasn1.pc']
diff --git a/recipes/libtheora.recipe b/recipes/libtheora.recipe
index 5fa36047..dacc9203 100644
--- a/recipes/libtheora.recipe
+++ b/recipes/libtheora.recipe
@@ -4,8 +4,15 @@
 class Recipe(recipe.Recipe):
     name = 'libtheora'
     version = '1.1.1'
+    license = 'BSD'
     deps = ['libogg', 'libvorbis']
 
+    files_libs = ['libtheora', 'libtheoradec', 'libtheoraenc']
+    files_bins = ['dvconnect', 'encodedv', 'dubdv']
+    files_devel = ['include/theora', 'lib/pkgconfig/libtheora.pc',
+                   'lib/pkgconfig/libtheoraenc.pc', 'lib/pkgconfig/libtheoradec.pc']
+
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options = ' --disable-spec --disable-doc'
diff --git a/recipes/libvisual.recipe b/recipes/libvisual.recipe
index 77f9f23d..f9873432 100644
--- a/recipes/libvisual.recipe
+++ b/recipes/libvisual.recipe
@@ -4,4 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'libvisual'
     version = '0.4.0'
+    license = 'LGPLv2.1'
     autoreconf = True
+
+    files_libs = ['libvisual-0.4']
+    files_devel = ['include/libvisual-0.4', 'lib/pkgconfig/libvisual-0.4.pc']
diff --git a/recipes/libvorbis.recipe b/recipes/libvorbis.recipe
index 7d7ff192..e2a8f877 100644
--- a/recipes/libvorbis.recipe
+++ b/recipes/libvorbis.recipe
@@ -4,4 +4,12 @@
 class Recipe(recipe.Recipe):
     name = 'libvorbis'
     version = '1.3.2'
+    license = 'BSD-like'
     deps = ['libogg']
+
+    files_libs = ['libvorbis', 'libvorbisenc', 'libvorbisfile']
+    files_bins = ['dvconnect', 'encodedv', 'dubdv']
+    files_devel = [
+        'include/vorbis', 'lib/pkgconfig/vorbis.pc',
+        'lib/pkgconfig/vorbisenc.pc', 'lib/pkgconfig/vorbisfile.pc']
+
diff --git a/recipes/libvpx.recipe b/recipes/libvpx.recipe
index e961cc11..2e4b0a98 100644
--- a/recipes/libvpx.recipe
+++ b/recipes/libvpx.recipe
@@ -4,11 +4,16 @@
 class Recipe(recipe.Recipe):
     name = 'libvpx'
     version = 'v1.0.0'
+    license = 'BSD'
     configure_tpl = "%(config-sh)s --prefix=%(prefix)s "\
                     "--libdir=%(libdir)s %(options)s"
     configure_options = "--enable-pic --as=yasm "
     add_host_build_target = False
 
+    files_libs = ['libvpx']
+    files_bins = ['vpxenc', 'vpxdec']
+    files_devel = ['include/vpx', 'lib/pkgconfig/vpx.pc']
+
 
     def prepare (self):
         if self.config.target_arch == Architecture.X86_64:
diff --git a/recipes/libxml2.recipe b/recipes/libxml2.recipe
index 1dde3d98..d613db66 100644
--- a/recipes/libxml2.recipe
+++ b/recipes/libxml2.recipe
@@ -4,9 +4,14 @@
 class Recipe(recipe.Recipe):
     name = 'libxml2'
     version = '2.7.8'
+    license = 'MIT'
     deps = [ 'zlib' ]
     platform_deps = { Platform.WINDOWS: ['libiconv'] }
 
+    files_libs = ['libxml']
+    files_devel = ['include/libxml2', 'bin/xml2-config']
+
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options = '--without-threads'
diff --git a/recipes/nettle.recipe b/recipes/nettle.recipe
index 9f720b54..a46f14c9 100644
--- a/recipes/nettle.recipe
+++ b/recipes/nettle.recipe
@@ -4,5 +4,10 @@
 class Recipe(recipe.Recipe):
     name = 'nettle'
     version = '2.4'
+    license = 'LGPLv2.1'
     configure_options = '--enable-shared'
     deps = ['gmp']
+
+    files_bins = ['nettle-hash', 'nettle-lfib-stream']
+    files_libs = ['libnettle']
+    files_devel = ['include/nettle', 'lib/pkgconfig/nettle.pc']
diff --git a/recipes/opencore-amr.recipe b/recipes/opencore-amr.recipe
index a362addb..236549fd 100644
--- a/recipes/opencore-amr.recipe
+++ b/recipes/opencore-amr.recipe
@@ -4,3 +4,9 @@
 class Recipe(recipe.Recipe):
     name = 'opencore-amr'
     version = '0.1.3'
+    license = 'Apachev2.0'
+
+    files_libs = ['libopencore-amrnb', 'libopencore-amrwb']
+    files_bins = ['dvconnect', 'encodedv', 'dubdv']
+    files_devel = ['include/opencore-amrwb', 'include/opencore-amrnb',
+        'lib/pkgconfig/opencore-amrwb.pc', 'lib/pkgconfig/opencore-amrnb.pc']
diff --git a/recipes/orc.recipe b/recipes/orc.recipe
index b10140bd..9d94bbaa 100644
--- a/recipes/orc.recipe
+++ b/recipes/orc.recipe
@@ -4,3 +4,10 @@
 class Recipe(recipe.Recipe):
     name = 'orc'
     version = '0.4.16'
+    license = 'BSD-like'
+
+    files_libs = ['liborc']
+    files_bins = ['orcc']
+    files_devel = ['include/orc-4.0', 'lib/pkgconfig/orc-0.4.pc',
+        'bin/orc-bugreport%(bext)s']
+
diff --git a/recipes/pango.recipe b/recipes/pango.recipe
index 7b4ff15d..e38a9a72 100644
--- a/recipes/pango.recipe
+++ b/recipes/pango.recipe
@@ -5,8 +5,21 @@ class Recipe(recipe.Recipe):
     name = 'pango'
     version = '1.28.4'
     autoreconf = True
+    license = 'LGPLv2.1'
     deps = ['cairo', 'fontconfig', 'freetype']
 
+    files_libs = ['libpangocairo', 'libpango', 'libpangoft2']
+    files_bins = ['pango-querymodules', 'pango-view']
+    files_devel = ['include/pango-1.0', 'lib/pango',
+        'lib/pkgconfig/pangoft2.pc', 'lib/pkgconfig/pango.pc',
+        'lib/pkgconfig/pangocairo.pc']
+    files_libs_platform = {
+        Platform.WINDOWS: ['libpangowin32'],
+    }
+    files_devel_platform = {
+        Platform.WINDOWS: ['lib/pkgconfig/pangowin32.pc'],
+    }
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.configure_options += '--with-included-modules'
diff --git a/recipes/pixman.recipe b/recipes/pixman.recipe
index 2d2c4f0c..2d18f519 100644
--- a/recipes/pixman.recipe
+++ b/recipes/pixman.recipe
@@ -4,3 +4,7 @@
 class Recipe(recipe.Recipe):
     name = 'pixman'
     version = '0.24.4'
+    license = 'MIT'
+
+    files_libs = ['libpixman-1']
+    files_devel = ['include/pixman-1', 'lib/pkgconfig/pixman-1.pc']
diff --git a/recipes/schroedinger.recipe b/recipes/schroedinger.recipe
index fc475213..1297897d 100644
--- a/recipes/schroedinger.recipe
+++ b/recipes/schroedinger.recipe
@@ -4,3 +4,7 @@
 class Recipe(recipe.Recipe):
     name = 'schroedinger'
     version = '1.0.11'
+    license = 'LGPLv2'
+
+    files_libs = ['libschroedinger-1.0']
+    files_devel = ['include/schroedinger-1.0', 'lib/pkgconfig/schroedinger-1.0.pc']
diff --git a/recipes/snappy.recipe b/recipes/snappy.recipe
index da6bc446..9dc23d9d 100644
--- a/recipes/snappy.recipe
+++ b/recipes/snappy.recipe
@@ -3,12 +3,16 @@
 class Recipe(recipe.Recipe):
     name = 'snappy'
     version = '0.2+git'
+    license = 'GPLv2'
     config_sh = 'autoreconf -fiv && sh ./configure'
     deps = ['glib', 'gstreamer', 'gst-plugins-base', 'clutter', 'clutter-gst']
     platform_deps = { Platform.LINUX: ['libXtst'] }
     use_system_libs = True
     remotes = {'upstream': 'https://github.com/luisbg/snappy.git'}
 
+    files_bins = ['snappy']
+    files_data = ['share/snappy']
+
     def prepare(self):
         if self.config.target_platform == Platform.LINUX:
             self.configure_options += ' --enable-dbus'
diff --git a/recipes/speex.recipe b/recipes/speex.recipe
index 2da813ac..e1a51e98 100644
--- a/recipes/speex.recipe
+++ b/recipes/speex.recipe
@@ -4,4 +4,10 @@
 class Recipe(recipe.Recipe):
     name = 'speex'
     version = '1.2rc1'
+    license = 'BSD-like'
     deps = ['libogg']
+
+    files_libs = ['libspeex', 'libspeexdsp']
+    files_bins = ['speexdec', 'speexenc']
+    files_devel = ['include/speex', 'lib/pkgconfig/speex.pc',
+        'lib/pkgconfig/speexdsp.pc']
diff --git a/recipes/tiff.recipe b/recipes/tiff.recipe
index 47277a6c..8568fbd9 100644
--- a/recipes/tiff.recipe
+++ b/recipes/tiff.recipe
@@ -4,4 +4,15 @@
 class Recipe(recipe.Recipe):
     name = 'tiff'
     version = '4.0.1'
+    license = 'BSD-like'
     deps = [ 'zlib' ]
+
+
+    files_libs = ['libtiff', 'libtiffxx']
+    files_bins = ['tiffcrop', 'bmp2tiff', 'gif2tiff', 'ppm2tiff'
+        'tiffdump', 'tiffsplit', 'tiffmedian', 'ras2tiff', 'tiff2ps',
+        'tiff2pdf', 'tiffset', 'tiffcp', 'tiff2rgba', 'tiffinfo', 'tiff2bw',
+        'raw2tiff', 'fax2tiff', 'tiffdither', 'tiffcmp']
+    files_devel = ['include/tiffvers.h', 'include/tiffio.h', 'include/tiff.h',
+        'include/tiffconf.h', 'include/tiffio.hxx',
+        'lib/pkgconfig/libtiff-4.pc']
diff --git a/recipes/wavpack.recipe b/recipes/wavpack.recipe
index b63369d1..b1814c49 100644
--- a/recipes/wavpack.recipe
+++ b/recipes/wavpack.recipe
@@ -4,8 +4,14 @@
 class Recipe(recipe.Recipe):
     name = 'wavpack'
     version = '4.60.1'
+    lincense = 'BSD-like'
     platform_deps = { Platform.WINDOWS: ['libiconv'] }
 
+    files_libs = ['libwavpack']
+    files_bins = ['wavpack']
+    files_devel = ['include/wavpack', 'lib/pkgconfig/wavpack.pc']
+
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.config_sh = 'export LDFLAGS="$LDFLAGS -liconv"; ./configure'
diff --git a/recipes/zlib.recipe b/recipes/zlib.recipe
index 17e452ca..fc4df9da 100644
--- a/recipes/zlib.recipe
+++ b/recipes/zlib.recipe
@@ -4,9 +4,14 @@
 class Recipe(recipe.Recipe):
     name = 'zlib'
     version = '1.2.6'
+    license = 'BSD-like'
     force_configure = True
     add_host_build_target = False
 
+    files_libs = ['libz']
+    files_devel = ['include/zlib.h', 'lib/pkgconfig/zlib.pc']
+
+
     def prepare(self):
         if self.config.target_platform == Platform.WINDOWS:
             self.make = 'make -f win32/Makefile.gcc PREFIX=%s- ' % self.config.host