summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--ccode/Makefile.am6
-rw-r--r--compiler/Makefile.am2
-rw-r--r--compiler/valacompiler.vala21
-rw-r--r--gee/Makefile.am6
-rw-r--r--gobject-introspection/Makefile.am2
-rw-r--r--gobject-introspection/gidl.vapi (renamed from gobject-introspection/gidl.vala)0
-rw-r--r--gobject/Makefile.am6
-rw-r--r--vala/Makefile.am6
-rw-r--r--vapi/Makefile.am70
-rw-r--r--vapi/atk.vapi (renamed from vapi/atk.vala)2
-rw-r--r--vapi/cairo.vapi (renamed from vapi/cairo.vala)0
-rw-r--r--vapi/config.vapi (renamed from vapi/config.vala)0
-rw-r--r--vapi/curses.vapi (renamed from vapi/curses.vala)0
-rw-r--r--vapi/dbus-glib-1.vapi (renamed from vapi/dbus-glib-1.vala)0
-rw-r--r--vapi/enchant.vapi (renamed from vapi/enchant.vala)0
-rw-r--r--vapi/gconf-2.0.vapi (renamed from vapi/gconf-2.0.vala)2
-rw-r--r--vapi/gdk-2.0.vapi (renamed from vapi/gdk-2.0.vala)2
-rw-r--r--vapi/gio-2.0.vapi (renamed from vapi/gio-2.0.vala)2
-rw-r--r--vapi/glib-2.0.vapi (renamed from vapi/glib-2.0.vala)0
-rw-r--r--vapi/gnet-2.0.vapi (renamed from vapi/gnet-2.0.vala)0
-rw-r--r--vapi/gnome-desktop-2.0.vapi (renamed from vapi/gnome-desktop-2.0.vala)2
-rw-r--r--vapi/gnome-vfs-2.0.vapi (renamed from vapi/gnome-vfs-2.0.vala)2
-rw-r--r--vapi/gstreamer-0.10.vapi (renamed from vapi/gstreamer-0.10.vala)2
-rw-r--r--vapi/gtk+-2.0.vapi (renamed from vapi/gtk+-2.0.vala)2
-rw-r--r--vapi/gtkmozembed.vapi (renamed from vapi/gtkmozembed.vala)0
-rw-r--r--vapi/gtksourceview-2.0.vapi (renamed from vapi/gtksourceview-2.0.vala)2
-rw-r--r--vapi/hal.vapi (renamed from vapi/hal.vala)0
-rw-r--r--vapi/hildon-1.vapi (renamed from vapi/hildon-1.vala)2
-rw-r--r--vapi/libglade-2.0.vapi (renamed from vapi/libglade-2.0.vala)2
-rw-r--r--vapi/libgnome-2.0.vapi (renamed from vapi/libgnome-2.0.vala)2
-rw-r--r--vapi/libgnomeui-2.0.vapi (renamed from vapi/libgnomeui-2.0.vala)2
-rw-r--r--vapi/libnotify.vapi (renamed from vapi/libnotify.vala)2
-rw-r--r--vapi/libpanelapplet-2.0.vapi (renamed from vapi/libpanelapplet-2.0.vala)0
-rw-r--r--vapi/libsoup-2.2.vapi (renamed from vapi/libsoup-2.2.vala)2
-rw-r--r--vapi/libwnck-1.0.vapi (renamed from vapi/libwnck-1.0.vala)2
-rw-r--r--vapi/libxml-2.0.vapi (renamed from vapi/libxml-2.0.vala)0
-rw-r--r--vapi/pango.vapi (renamed from vapi/pango.vala)2
-rw-r--r--vapi/poppler-glib.vapi (renamed from vapi/poppler-glib.vala)2
-rw-r--r--vapi/sqlite3.vapi (renamed from vapi/sqlite3.vala)0
-rw-r--r--vapi/vte.vapi (renamed from vapi/vte.vala)2
-rw-r--r--vapi/zlib.vapi (renamed from vapi/zlib.vala)0
-rw-r--r--vapigen/Makefile.am6
43 files changed, 76 insertions, 92 deletions
diff --git a/ChangeLog b/ChangeLog
index 17c11bf9e..0d3b7800d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-10-09 Jürg Billeter <j@bitron.ch>
+ Use --basedir in build system and rename all VAPI files to .vapi,
+ requires r646 to build
+
+2007-10-09 Jürg Billeter <j@bitron.ch>
+
* vala/valacodecontext.vala, vala/valasourcefile.vala,
gobject/valaccodecompiler.vala,
gobject/valaccodegeneratorsourcefile.vala, compiler/valacompiler.vala,
diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index 7820288df..95443ea7a 100644
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -215,12 +215,12 @@ ccodeinclude_HEADERS = \
valaccodeelementaccess.h \
$(NULL)
-ccode.vala ccode.vala.stamp: $(filter %.vala,$(libvalaccode_la_SOURCES))
- $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --library ccode $^
+ccode.vapi ccode.vala.stamp: $(filter %.vala,$(libvalaccode_la_SOURCES))
+ $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --basedir $(top_srcdir) --library ccode $^
touch $@
libvalaccode_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
-EXTRA_DIST = ccode.vala ccode.vala.stamp
+EXTRA_DIST = ccode.vapi ccode.vala.stamp
diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index df06189bc..bc1954303 100644
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -19,7 +19,7 @@ valac_SOURCES = \
$(NULL)
valac.vala.stamp: $(filter %.vala,$(valac_SOURCES))
- $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config $^
+ $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config --basedir $(top_srcdir) $^
touch $@
valac_CPPFLAGS = \
diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index d08c21ec6..b1735a28d 100644
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -86,7 +86,6 @@ class Vala.Compiler : Object {
private string get_package_path (string! pkg) {
string basename = "%s.vapi".printf (pkg);
- string basename_old = "%s.vala".printf (pkg);
if (vapi_directories != null) {
foreach (string vapidir in vapi_directories) {
@@ -94,10 +93,6 @@ class Vala.Compiler : Object {
if (FileUtils.test (filename, FileTest.EXISTS)) {
return filename;
}
- var filename_old = Path.build_filename (vapidir, basename_old);
- if (FileUtils.test (filename_old, FileTest.EXISTS)) {
- return filename_old;
- }
}
}
@@ -106,31 +101,16 @@ class Vala.Compiler : Object {
return filename;
}
- string filename_old = Path.build_filename (Config.PACKAGE_DATADIR, "vapi", basename_old);
- if (FileUtils.test (filename_old, FileTest.EXISTS)) {
- return filename_old;
- }
-
filename = Path.build_filename ("/usr/local/share/vala/vapi", basename);
if (FileUtils.test (filename, FileTest.EXISTS)) {
return filename;
}
- filename_old = Path.build_filename ("/usr/local/share/vala/vapi", basename_old);
- if (FileUtils.test (filename_old, FileTest.EXISTS)) {
- return filename_old;
- }
-
filename = Path.build_filename ("/usr/share/vala/vapi", basename);
if (FileUtils.test (filename, FileTest.EXISTS)) {
return filename;
}
- filename_old = Path.build_filename ("/usr/share/vala/vapi", basename_old);
- if (FileUtils.test (filename_old, FileTest.EXISTS)) {
- return filename_old;
- }
-
return null;
}
@@ -291,7 +271,6 @@ class Vala.Compiler : Object {
if (library != null) {
var interface_writer = new InterfaceWriter ();
- interface_writer.write_file (context, "%s.vala".printf (library));
interface_writer.write_file (context, "%s.vapi".printf (library));
library = null;
diff --git a/gee/Makefile.am b/gee/Makefile.am
index c798d69c0..ae085dad3 100644
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -72,12 +72,12 @@ geeinclude_HEADERS = \
set.h \
$(NULL)
-gee.vala gee.vala.stamp: $(filter %.vala,$(libgee_la_SOURCES))
- $(VALAC) --vapidir $(srcdir)/../vapi --library gee $^
+gee.vapi gee.vala.stamp: $(filter %.vala,$(libgee_la_SOURCES))
+ $(VALAC) --vapidir $(srcdir)/../vapi --basedir $(top_srcdir) --library gee $^
touch $@
libgee_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
-EXTRA_DIST = gee.vala gee.vala.stamp
+EXTRA_DIST = gee.vapi gee.vala.stamp
diff --git a/gobject-introspection/Makefile.am b/gobject-introspection/Makefile.am
index 7196fe6e3..c59842419 100644
--- a/gobject-introspection/Makefile.am
+++ b/gobject-introspection/Makefile.am
@@ -22,4 +22,4 @@ libgidl_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
-EXTRA_DIST = gidl.vala
+EXTRA_DIST = gidl.vapi
diff --git a/gobject-introspection/gidl.vala b/gobject-introspection/gidl.vapi
index 0d2181ad1..0d2181ad1 100644
--- a/gobject-introspection/gidl.vala
+++ b/gobject-introspection/gidl.vapi
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index ae2631acb..9660607ab 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -104,8 +104,8 @@ gobjectinclude_HEADERS = \
valatyperegisterfunction.h \
$(NULL)
-gobject.vala gobject.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
- $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --library gobject $^
+gobject.vapi gobject.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
+ $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --basedir $(top_srcdir) --library gobject $^
touch $@
libvala_la_LIBADD = \
@@ -113,4 +113,4 @@ libvala_la_LIBADD = \
../vala/libvalacore.la \
$(NULL)
-EXTRA_DIST = gobject.vala gobject.vala.stamp
+EXTRA_DIST = gobject.vapi gobject.vala.stamp
diff --git a/vala/Makefile.am b/vala/Makefile.am
index cd24897aa..9174b16e4 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -437,8 +437,8 @@ valainclude_HEADERS = \
valawhilestatement.h \
$(NULL)
-vala.vala vala.vala.stamp: $(filter %.vala,$(libvalacore_la_SOURCES))
- $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --library vala $^
+vala.vapi vala.vala.stamp: $(filter %.vala,$(libvalacore_la_SOURCES))
+ $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --basedir $(top_srcdir) --library vala $^
touch $@
libvalacore_la_LIBADD = \
@@ -447,4 +447,4 @@ libvalacore_la_LIBADD = \
../ccode/libvalaccode.la \
$(NULL)
-EXTRA_DIST = vala.vala vala.vala.stamp
+EXTRA_DIST = vala.vapi vala.vala.stamp
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index aec54e785..2e94679a1 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -2,60 +2,60 @@ NULL =
vapidir = $(pkgdatadir)/vapi
-vala-1.0.vala: ../ccode/ccode.vala ../vala/vala.vala ../gobject/gobject.vala
+vala-1.0.vapi: ../ccode/ccode.vapi ../vala/vala.vapi ../gobject/gobject.vapi
cat $^ > $@
-gee-1.0.vala: ../gee/gee.vala
+gee-1.0.vapi: ../gee/gee.vapi
cat $^ > $@
dist_vapi_DATA = \
- atk.vala \
- cairo.vala \
- curses.vala \
- dbus-glib-1.vala \
- enchant.vala \
- gconf-2.0.vala \
- glib-2.0.vala \
+ atk.vapi \
+ cairo.vapi \
+ curses.vapi \
+ dbus-glib-1.vapi \
+ enchant.vapi \
+ gconf-2.0.vapi \
+ glib-2.0.vapi \
gdk-2.0.deps \
- gdk-2.0.vala \
- gio-2.0.vala \
- gnome-desktop-2.0.vala \
- gnome-vfs-2.0.vala \
- gstreamer-0.10.vala \
+ gdk-2.0.vapi \
+ gio-2.0.vapi \
+ gnome-desktop-2.0.vapi \
+ gnome-vfs-2.0.vapi \
+ gstreamer-0.10.vapi \
gtk+-2.0.deps \
- gtk+-2.0.vala \
+ gtk+-2.0.vapi \
gtkmozembed.deps \
- gtkmozembed.vala \
+ gtkmozembed.vapi \
gtksourceview-2.0.deps \
- gtksourceview-2.0.vala \
+ gtksourceview-2.0.vapi \
hal.deps \
- hal.vala \
+ hal.vapi \
hildon-1.deps \
- hildon-1.vala \
+ hildon-1.vapi \
libglade-2.0.deps \
- libglade-2.0.vala \
- libgnome-2.0.vala \
+ libglade-2.0.vapi \
+ libgnome-2.0.vapi \
libgnomeui-2.0.deps \
- libgnomeui-2.0.vala \
+ libgnomeui-2.0.vapi \
libnotify.deps \
- libnotify.vala \
+ libnotify.vapi \
libpanelapplet-2.0.deps \
- libpanelapplet-2.0.vala \
- libwnck-1.0.vala \
- libsoup-2.2.vala \
- libxml-2.0.vala \
+ libpanelapplet-2.0.vapi \
+ libwnck-1.0.vapi \
+ libsoup-2.2.vapi \
+ libxml-2.0.vapi \
pango.deps \
- pango.vala \
+ pango.vapi \
poppler-glib.deps \
- poppler-glib.vala \
- sqlite3.vala \
- vala-1.0.vala \
+ poppler-glib.vapi \
+ sqlite3.vapi \
+ vala-1.0.vapi \
vte.deps \
- vte.vala \
- zlib.vala \
+ vte.vapi \
+ zlib.vapi \
$(NULL)
dist_noinst_DATA = \
- config.vala \
- gee-1.0.vala \
+ config.vapi \
+ gee-1.0.vapi \
$(NULL)
diff --git a/vapi/atk.vala b/vapi/atk.vapi
index 6a79b80a4..63e754dfa 100644
--- a/vapi/atk.vala
+++ b/vapi/atk.vapi
@@ -1,4 +1,4 @@
-/* atk.vala generated by lt-vapigen, do not modify. */
+/* atk.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Atk", lower_case_cprefix = "atk_")]
namespace Atk {
diff --git a/vapi/cairo.vala b/vapi/cairo.vapi
index cf60d3167..cf60d3167 100644
--- a/vapi/cairo.vala
+++ b/vapi/cairo.vapi
diff --git a/vapi/config.vala b/vapi/config.vapi
index deb5759ea..deb5759ea 100644
--- a/vapi/config.vala
+++ b/vapi/config.vapi
diff --git a/vapi/curses.vala b/vapi/curses.vapi
index be903089b..be903089b 100644
--- a/vapi/curses.vala
+++ b/vapi/curses.vapi
diff --git a/vapi/dbus-glib-1.vala b/vapi/dbus-glib-1.vapi
index b9984db31..b9984db31 100644
--- a/vapi/dbus-glib-1.vala
+++ b/vapi/dbus-glib-1.vapi
diff --git a/vapi/enchant.vala b/vapi/enchant.vapi
index 1d7ea93ff..1d7ea93ff 100644
--- a/vapi/enchant.vala
+++ b/vapi/enchant.vapi
diff --git a/vapi/gconf-2.0.vala b/vapi/gconf-2.0.vapi
index f1b392107..38af1819c 100644
--- a/vapi/gconf-2.0.vala
+++ b/vapi/gconf-2.0.vapi
@@ -1,4 +1,4 @@
-/* gconf-2.0.vala generated by lt-vapigen, do not modify. */
+/* gconf-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "GConf", lower_case_cprefix = "gconf_")]
namespace GConf {
diff --git a/vapi/gdk-2.0.vala b/vapi/gdk-2.0.vapi
index a46b939d2..eab28c9fe 100644
--- a/vapi/gdk-2.0.vala
+++ b/vapi/gdk-2.0.vapi
@@ -1,4 +1,4 @@
-/* gdk-2.0.vala generated by lt-vapigen, do not modify. */
+/* gdk-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
namespace Gdk {
diff --git a/vapi/gio-2.0.vala b/vapi/gio-2.0.vapi
index dbdda954f..7a8ea4853 100644
--- a/vapi/gio-2.0.vala
+++ b/vapi/gio-2.0.vapi
@@ -1,4 +1,4 @@
-/* gio-2.0.vala generated by lt-vapigen, do not modify. */
+/* gio-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "G", lower_case_cprefix = "g_")]
namespace GLib {
diff --git a/vapi/glib-2.0.vala b/vapi/glib-2.0.vapi
index e62bee24c..e62bee24c 100644
--- a/vapi/glib-2.0.vala
+++ b/vapi/glib-2.0.vapi
diff --git a/vapi/gnet-2.0.vala b/vapi/gnet-2.0.vapi
index 1bd00e602..1bd00e602 100644
--- a/vapi/gnet-2.0.vala
+++ b/vapi/gnet-2.0.vapi
diff --git a/vapi/gnome-desktop-2.0.vala b/vapi/gnome-desktop-2.0.vapi
index b3344692c..64076abfc 100644
--- a/vapi/gnome-desktop-2.0.vala
+++ b/vapi/gnome-desktop-2.0.vapi
@@ -1,4 +1,4 @@
-/* gnome-desktop-2.0.vala generated by lt-vapigen, do not modify. */
+/* gnome-desktop-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
diff --git a/vapi/gnome-vfs-2.0.vala b/vapi/gnome-vfs-2.0.vapi
index a1af708af..97c3fdbb1 100644
--- a/vapi/gnome-vfs-2.0.vala
+++ b/vapi/gnome-vfs-2.0.vapi
@@ -1,4 +1,4 @@
-/* gnome-vfs-2.0.vala generated by lt-vapigen, do not modify. */
+/* gnome-vfs-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "GnomeVFS", lower_case_cprefix = "gnome_vfs_")]
namespace GnomeVFS {
diff --git a/vapi/gstreamer-0.10.vala b/vapi/gstreamer-0.10.vapi
index 6214b1a4a..5f1749e51 100644
--- a/vapi/gstreamer-0.10.vala
+++ b/vapi/gstreamer-0.10.vapi
@@ -1,4 +1,4 @@
-/* gstreamer-0.10.vala generated by lt-vapigen, do not modify. */
+/* gstreamer-0.10.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
diff --git a/vapi/gtk+-2.0.vala b/vapi/gtk+-2.0.vapi
index 56bd662e7..ac8e71116 100644
--- a/vapi/gtk+-2.0.vala
+++ b/vapi/gtk+-2.0.vapi
@@ -1,4 +1,4 @@
-/* gtk+-2.0.vala generated by lt-vapigen, do not modify. */
+/* gtk+-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
namespace Gtk {
diff --git a/vapi/gtkmozembed.vala b/vapi/gtkmozembed.vapi
index 38c5c8180..38c5c8180 100644
--- a/vapi/gtkmozembed.vala
+++ b/vapi/gtkmozembed.vapi
diff --git a/vapi/gtksourceview-2.0.vala b/vapi/gtksourceview-2.0.vapi
index e0dee6c78..3b57353be 100644
--- a/vapi/gtksourceview-2.0.vala
+++ b/vapi/gtksourceview-2.0.vapi
@@ -1,4 +1,4 @@
-/* gtksourceview-2.0.vala generated by lt-vapigen, do not modify. */
+/* gtksourceview-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
namespace Gtk {
diff --git a/vapi/hal.vala b/vapi/hal.vapi
index 24e96e2a2..24e96e2a2 100644
--- a/vapi/hal.vala
+++ b/vapi/hal.vapi
diff --git a/vapi/hildon-1.vala b/vapi/hildon-1.vapi
index fc3675d03..dae293ab9 100644
--- a/vapi/hildon-1.vala
+++ b/vapi/hildon-1.vapi
@@ -1,4 +1,4 @@
-/* hildon-1.vala generated by lt-vapigen, do not modify. */
+/* hildon-1.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")]
namespace Hildon {
diff --git a/vapi/libglade-2.0.vala b/vapi/libglade-2.0.vapi
index 265022818..8d51e6cfe 100644
--- a/vapi/libglade-2.0.vala
+++ b/vapi/libglade-2.0.vapi
@@ -1,4 +1,4 @@
-/* libglade-2.0.vala generated by lt-vapigen, do not modify. */
+/* libglade-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Glade", lower_case_cprefix = "glade_")]
namespace Glade {
diff --git a/vapi/libgnome-2.0.vala b/vapi/libgnome-2.0.vapi
index 6e1418da2..3061fda48 100644
--- a/vapi/libgnome-2.0.vala
+++ b/vapi/libgnome-2.0.vapi
@@ -1,4 +1,4 @@
-/* libgnome-2.0.vala generated by lt-vapigen, do not modify. */
+/* libgnome-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
diff --git a/vapi/libgnomeui-2.0.vala b/vapi/libgnomeui-2.0.vapi
index f9c29c8bf..65f4b4c07 100644
--- a/vapi/libgnomeui-2.0.vala
+++ b/vapi/libgnomeui-2.0.vapi
@@ -1,4 +1,4 @@
-/* libgnomeui-2.0.vala generated by lt-vapigen, do not modify. */
+/* libgnomeui-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
diff --git a/vapi/libnotify.vala b/vapi/libnotify.vapi
index 3cb10a255..3cc4985e6 100644
--- a/vapi/libnotify.vala
+++ b/vapi/libnotify.vapi
@@ -1,4 +1,4 @@
-/* libnotify.vala generated by lt-vapigen, do not modify. */
+/* libnotify.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Notify", lower_case_cprefix = "notify_")]
namespace Notify {
diff --git a/vapi/libpanelapplet-2.0.vala b/vapi/libpanelapplet-2.0.vapi
index ddcaedc80..ddcaedc80 100644
--- a/vapi/libpanelapplet-2.0.vala
+++ b/vapi/libpanelapplet-2.0.vapi
diff --git a/vapi/libsoup-2.2.vala b/vapi/libsoup-2.2.vapi
index 596a53f22..651757551 100644
--- a/vapi/libsoup-2.2.vala
+++ b/vapi/libsoup-2.2.vapi
@@ -1,4 +1,4 @@
-/* libsoup-2.2.vala generated by lt-vapigen, do not modify. */
+/* libsoup-2.2.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
namespace Soup {
diff --git a/vapi/libwnck-1.0.vala b/vapi/libwnck-1.0.vapi
index 3f06ba4bc..5e1314283 100644
--- a/vapi/libwnck-1.0.vala
+++ b/vapi/libwnck-1.0.vapi
@@ -1,4 +1,4 @@
-/* libwnck-1.0.vala generated by lt-vapigen, do not modify. */
+/* libwnck-1.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Wnck", lower_case_cprefix = "wnck_")]
namespace Wnck {
diff --git a/vapi/libxml-2.0.vala b/vapi/libxml-2.0.vapi
index 77490a2c5..77490a2c5 100644
--- a/vapi/libxml-2.0.vala
+++ b/vapi/libxml-2.0.vapi
diff --git a/vapi/pango.vala b/vapi/pango.vapi
index 148d064be..e72e3734f 100644
--- a/vapi/pango.vala
+++ b/vapi/pango.vapi
@@ -1,4 +1,4 @@
-/* pango.vala generated by lt-vapigen, do not modify. */
+/* pango.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Pango", lower_case_cprefix = "pango_")]
namespace Pango {
diff --git a/vapi/poppler-glib.vala b/vapi/poppler-glib.vapi
index a811ad771..7543e27dd 100644
--- a/vapi/poppler-glib.vala
+++ b/vapi/poppler-glib.vapi
@@ -1,4 +1,4 @@
-/* poppler-glib.vala generated by lt-vapigen, do not modify. */
+/* poppler-glib.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Poppler", lower_case_cprefix = "poppler_")]
namespace Poppler {
diff --git a/vapi/sqlite3.vala b/vapi/sqlite3.vapi
index c78dad84b..c78dad84b 100644
--- a/vapi/sqlite3.vala
+++ b/vapi/sqlite3.vapi
diff --git a/vapi/vte.vala b/vapi/vte.vapi
index 91094712d..d31a37f1d 100644
--- a/vapi/vte.vala
+++ b/vapi/vte.vapi
@@ -1,4 +1,4 @@
-/* vte.vala generated by lt-vapigen, do not modify. */
+/* vte.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Vte", lower_case_cprefix = "vte_")]
namespace Vte {
diff --git a/vapi/zlib.vala b/vapi/zlib.vapi
index 0610dc189..0610dc189 100644
--- a/vapi/zlib.vala
+++ b/vapi/zlib.vapi
diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index f03a12100..46cc773a1 100644
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -34,11 +34,11 @@ vapicheck_SOURCES = \
$(NULL)
vapigen.vala.stamp: $(filter %.vala,$(vapigen_SOURCES))
- $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
+ $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
touch $@
vapicheck.vala.stamp: $(filter %.vala,$(vapicheck_SOURCES))
- $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
+ $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
touch $@
vapigen_LDADD = \
@@ -55,4 +55,4 @@ vapicheck_LDADD = \
../gobject-introspection/libgidl.la \
$(NULL)
-EXTRA_DIST = vapigen.vala.stamp
+EXTRA_DIST = vapigen.vala.stamp vapicheck.vala.stamp
View Lorry Controller Status