[ease/waf] Minor coding style changes for waf...All pretty now :)



commit be20048269df7db4ddd24ec28722cb582d0760ee
Author: Robert Carr <racarr gnome org>
Date:   Tue Dec 14 09:45:48 2010 -0500

    Minor coding style changes for waf...All pretty now :)

 ease-core/wscript |   18 +++++++++---------
 flutter/wscript   |   14 +++++++-------
 wscript           |    5 +++--
 3 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/ease-core/wscript b/ease-core/wscript
index 46d73c3..c696996 100644
--- a/ease-core/wscript
+++ b/ease-core/wscript
@@ -36,19 +36,19 @@ def build(bld):
 	print version
 	library_name = 'ease-core-' + version
 
-	prog = bld(features='c cshlib', after='flutter')
+	lib = bld(features='c cshlib', after='flutter')
 
-	prog.name = "ease-core"
-	prog.target = library_name
+	lib.name = "ease-core"
+	lib.target = library_name
 	
-	prog.source = " ".join(ease_core_files)
+	lib.source = " ".join(ease_core_files)
 
-	prog.cflags = ['-include', 'config.h']
-	prog.uselib = 'GOBJECT CLUTTER GEE CLUTTERGST GMODULE LIBARCHIVE POPPLERGLIB RESTEXTRAS CLUTTERGTK JSONGLIB'
-	prog.packages = 'flutter-' + bld.env["FLUTTER_VERSION"][0] + " "
-	prog.packages += " ".join(ease_core_packages)
+	lib.cflags = ['-include', 'config.h']
+	lib.uselib = 'GOBJECT CLUTTER GEE CLUTTERGST GMODULE LIBARCHIVE POPPLERGLIB RESTEXTRAS CLUTTERGTK JSONGLIB'
+	lib.packages = 'flutter-' + bld.env["FLUTTER_VERSION"][0] + " "
+	lib.packages += " ".join(ease_core_packages)
 	
-	prog.gir = "EaseCore-" + version
+	lib.gir = "EaseCore-" + version
 
 
 
diff --git a/flutter/wscript b/flutter/wscript
index edaf2a0..b6f89d5 100644
--- a/flutter/wscript
+++ b/flutter/wscript
@@ -3,15 +3,15 @@
 def build(bld):
 	version = bld.FLUTTER_VERSION
 	library_name = 'flutter-%s' % (version, )
-	prog = bld(features='c cshlib')
-	prog.name = 'flutter'
-	prog.target = library_name
-	prog.source = 'flutter.vala'
-	prog.includes = '..'
-	prog.uselib = 'GOBJECT CLUTTER'
+	lib = bld(features='c cshlib')
+	lib.name = 'flutter'
+	lib.target = library_name
+	lib.source = 'flutter.vala'
+	lib.includes = '..'
+	lib.uselib = 'GOBJECT CLUTTER'
 
 	# Vala packages to use
-	prog.packages = 'clutter-1.0'
+	lib.packages = 'clutter-1.0'
 	
 
 
diff --git a/wscript b/wscript
index aef3718..6452c8a 100644
--- a/wscript
+++ b/wscript
@@ -86,12 +86,13 @@ def build(bld):
     bld.srcdir = top 
     bld.builddir = out
     
-    bld.add_subdirs('data')
-
     bld.add_subdirs('flutter')
     bld.add_group()
+
     bld.add_subdirs('ease-core')
+    bld.add_subdirs('data')
     bld.add_group()
+
     bld.add_subdirs('ease')
     bld.add_group()
     



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]