Clone in a terminal:
Commit 7a6adb1
Johan Mattsson - 2012-09-04T08:40:49+00:00
7a6adb1b4bb198f5f222ed3a0d7783d8c8589ab9johan.mattsson.m@gmail.com

fix build error

Changed files (1)

Diff

diff --git a/src/wscript b/src/wscriptindex f284220..fe20a5b 100644--- a/src/wscript+++ b/src/wscript@@ -89,43 +89,49 @@ def build (bld): 	)
 
 	bld (
-		rule = "valac -C ./src/birdfont.vapi ../src/Main.vala -X ../build/src/libbirdfont.so -X ../build/src/birdfont.h --pkg gtk+-2.0 --pkg libxml-2.0 --pkg gdk-2.0 --pkg webkit-1.0"
+		rule          = "mv src/birdfont.h ./",
+		depends       = "libbirdfont",
+		name          = "birdfont_h"
 	)
-
+	
 	bld (
-		rule = "valac -C ./src/birdfont.vapi ../src/BirdfontExport.vala -X ../build/src/libbirdfont.so -X ../build/src/birdfont.h --pkg gtk+-2.0 --pkg libxml-2.0 --pkg gdk-2.0 --pkg webkit-1.0"
+		rule = 'valac -C ./src/birdfont.vapi ../src/Main.vala -X ../build/src/libbirdfont.so -X ./birdfont.h --pkg gtk+-2.0 --pkg libxml-2.0 --pkg gdk-2.0 --pkg webkit-1.0',
+		name = 'main_c',
+		target = '../Main.c',
+		depends = 'libbirdfont'
 	)
 
 	bld (
-		rule          = "mv src/birdfont.h ./",
-		depends       = "libbirdfont",
-		name          = "birdfont_h"
+		rule = "valac -C ./src/birdfont.vapi ../src/BirdfontExport.vala -X ../build/src/libbirdfont.so -X ./birdfont.h --pkg gtk+-2.0 --pkg libxml-2.0 --pkg gdk-2.0 --pkg webkit-1.0",
+		depends = 'libbirdfont',
+		target = '../BirdfontExport.c',
+		name = 'birdfont_export'
 	)
 
 	bld (
-		rule = 'gcc  ../build/Main.c -L  ../build/src -l birdfont -o ${TGT} \
+		rule = 'gcc  ../build/Main.c -I../build/ -L  ../build/src -l birdfont -o ${TGT} \
 				$(pkg-config --cflags --libs glib-2.0) \
 				$(pkg-config --cflags --libs libxml-2.0) \
 				$(pkg-config --cflags --libs gio-2.0) \
 				$(pkg-config --cflags --libs libsoup-2.4) \
 				$(pkg-config --cflags --libs gtk+-2.0) \
 				$(pkg-config --cflags --libs webkit-1.0)',
-		source  = ['Main.c'],
+		source  = ['../Main.c'],
 		target  = 'birdfont',
-		depends = 'birdfont_h'
+		depends = 'main_c'
 	)
 
 	bld (
-		rule = 'gcc  ../build/BirdfontExport.c -L  ../build/src -l birdfont -o ${TGT} \
+		rule = 'gcc  ../build/BirdfontExport.c -I../build/ -L  ../build/src -l birdfont -o ${TGT} \
 				$(pkg-config --cflags --libs glib-2.0) \
 				$(pkg-config --cflags --libs libxml-2.0) \
 				$(pkg-config --cflags --libs gio-2.0) \
 				$(pkg-config --cflags --libs libsoup-2.4) \
 				$(pkg-config --cflags --libs gtk+-2.0) \
 				$(pkg-config --cflags --libs webkit-1.0)',
-		source  = ['Main.c'],
+		source  = ['../BirdfontExport.c'],
 		target  = 'birdfont-export',
-		depends = 'birdfont_h'
+		depends = 'birdfont_export'
 	)
 	
 	bld.install_files('${PREFIX}/bin/', ['birdfont', 'birdfont-export'])

Contact

Email: johan.mattsson.m@gmail.com
Mastodon: typo.social/@birdfont
GitHub: johanmattssonm
LinkedIn: johan-mattsson-2ab324112