diff options
| author | Daniel G. Siegel <dgsiegel@src.gnome.org> | 2008-10-20 08:49:24 +0000 |
|---|---|---|
| committer | Daniel G. Siegel <dgsiegel@src.gnome.org> | 2008-10-20 08:49:24 +0000 |
| commit | 887cd351a6e4200e3fba68fa828f9020cf63efa8 (patch) | |
| tree | 7514c4fd87df4f067af37d6c68b748871d9e5b3b | |
| parent | 4dae6e781dd5e7c6794463b98fd27de76e878c50 (diff) | |
| download | cheese-887cd351a6e4200e3fba68fa828f9020cf63efa8.tar.gz | |
remove gnome-vfs dependency from waf
svn path=/trunk/; revision=1114
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/wscript_build | 8 | ||||
| -rw-r--r-- | wscript | 4 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2008-10-20 daniel g. siegel <dgsiegel@gmail.com> + + * src/wscript_build, + wscript: + remove gnome-vfs dependency from waf + 2008-10-17 Cosimo Cecchi <cosimoc@gnome.org> * configure.ac: diff --git a/src/wscript_build b/src/wscript_build index 130f6079..698a0685 100644 --- a/src/wscript_build +++ b/src/wscript_build @@ -13,10 +13,10 @@ obj = bld.create_obj('cc', 'program') obj.find_sources_in_dirs('.') # take the sources in the current folder obj.includes='.' -obj.uselib='''GLIB GOBJECT GTK LIBGLADE GDK HAL - GSTREAMER GSTREAMER_PLUGINS_BASE - GNOME_VFS CAIRO PANGOCAIRO LIBRSVG - LIBGNOMEUI LIBEBOOK XXF86VM''' +obj.uselib='''GLIB GOBJECT GIO GTK GDK + LIBGNOMEDESKTOP GCONF GSTREAMER + GSTREAMER_PLUGINS_BASE LIBEBOOK + CAIRO DBUS DBUSGLIB HAL PANGOCAIRO LIBRSVG''' obj.target='cheese' obj.add_dbus_file('cheese-dbus-infos.xml', 'cheese_dbus', 'glib-server') @@ -38,11 +38,10 @@ def configure(conf): conf.check_pkg('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=True) conf.check_pkg('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True) conf.check_pkg('gdk-2.0', destvar='GDK', vnum='2.12.0', mandatory=True) - conf.check_pkg('libgnomeui-2.0', destvar='LIBGNOMEUI', vnum='2.20.0', mandatory=True) + conf.check_pkg('gnome-desktop-2.0', destvar='LIBGNOMEDESKTOP', vnum='2.25.1', mandatory=True) conf.check_pkg('gconf-2.0', destvar='GCONF', vnum='2.16.0', mandatory=True) conf.check_pkg('gstreamer-0.10', destvar='GSTREAMER', vnum='0.10.20', mandatory=True) conf.check_pkg('gstreamer-plugins-base-0.10', destvar='GSTREAMER_PLUGINS_BASE', vnum='0.10.20', mandatory=True) - conf.check_pkg('gnome-vfs-2.0', destvar='GNOMEVFS', vnum='2.18.0', mandatory=True) conf.check_pkg('libebook-1.2', destvar='LIBEBOOK', vnum='1.12.0', mandatory=True) conf.check_pkg('cairo', destvar='CAIRO', vnum='1.4.0', mandatory=True) conf.check_pkg('dbus-1', destvar='DBUS', vnum='1.0', mandatory=True) @@ -76,6 +75,7 @@ def configure(conf): conf.define('PACKAGE_LIBEXECDIR', conf.env['PREFIX'] + '/libexec/cheese') conf.define('BINDIR', conf.env['PREFIX'] + '/bin') conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H') + conf.env.append_value('CCFLAGS', '-DGNOME_DESKTOP_USE_UNSTABLE_API=1') conf.write_config_header('cheese-config.h') |