Use --basedir in build system and rename all VAPI files to .vapi, requires

2007-10-09  Juerg Billeter  <j@bitron.ch>

	Use --basedir in build system and rename all VAPI files to .vapi,
	requires r646 to build

svn path=/trunk/; revision=647

diff --git a/ChangeLog b/ChangeLog
index 17c11bf9e52780231e32e907803633a3078a0695..0d3b7800d65c88a6ee163605caef7fe4bb78f655 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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,

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index 7820288dfbc5a9bde4f30e9448acf4f6775e8a9e..95443ea7a916cb12bc6352be362b5444fe38d6b1 100644 (file)
--- 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 df06189bc5fd7a2ffc69096e7a864d62832f4089..bc19543031a9f92a16f8d3e0846d73529eb053cc 100644 (file)
--- 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 d08c21ec6ec2eb0800e9f50d20ebf9bc08ef23c0..b1735a28d2ac916291f98b1944c60517e5e61247 100644 (file)
--- 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 c798d69c0c6be99a4a78e192da18b73245eac0ab..ae085dad3f5f0871a3f4c78d26db675fce18d5b8 100644 (file)
--- 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 7196fe6e38034666cd3ad38991d089dab5ffa032..c598424196ecac820130feb5ab731832b0001b3d 100644 (file)
--- 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
similarity index 100%
rename from gobject-introspection/gidl.vala
rename to gobject-introspection/gidl.vapi

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index ae2631acb961d33a1ddb80ec82dc8055890269ac..9660607ab96add7fb766035b21f6860005f373b0 100644 (file)
--- 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 cd24897aac1c036e2fd34132809891929c258882..9174b16e4cbc2a8f880245e98cc2db7d9eaa1a9d 100644 (file)
--- 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 aec54e7855de2c239a22ea0ecf246376f8e7c5bc..2e94679a1cab90c850770c1a138b5b7cbdeb6267 100644 (file)
--- 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
similarity index 99%
rename from vapi/atk.vala
rename to vapi/atk.vapi
index 6a79b80a4912ad38f6526b5e8214719f163262de..63e754dfa40bcc1ecf55f687e544e264478e8539 100644 (file)
--- 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
similarity index 100%
rename from vapi/cairo.vala
rename to vapi/cairo.vapi

diff --git a/vapi/config.vala b/vapi/config.vapi
similarity index 100%
rename from vapi/config.vala
rename to vapi/config.vapi

diff --git a/vapi/curses.vala b/vapi/curses.vapi
similarity index 100%
rename from vapi/curses.vala
rename to vapi/curses.vapi

diff --git a/vapi/dbus-glib-1.vala b/vapi/dbus-glib-1.vapi
similarity index 100%
rename from vapi/dbus-glib-1.vala
rename to vapi/dbus-glib-1.vapi

diff --git a/vapi/enchant.vala b/vapi/enchant.vapi
similarity index 100%
rename from vapi/enchant.vala
rename to vapi/enchant.vapi

diff --git a/vapi/gconf-2.0.vala b/vapi/gconf-2.0.vapi
similarity index 99%
rename from vapi/gconf-2.0.vala
rename to vapi/gconf-2.0.vapi
index f1b392107b04eb3f5e08de60bad561e338d5db96..38af1819c3dbfbccaa608068797c324b5c487fd8 100644 (file)
--- 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
similarity index 99%
rename from vapi/gdk-2.0.vala
rename to vapi/gdk-2.0.vapi
index a46b939d286e3b392568c6c3edc09a14299dcf40..eab28c9fe34be0e6e2ba9a4af48e55da94e9dd34 100644 (file)
--- 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
similarity index 99%
rename from vapi/gio-2.0.vala
rename to vapi/gio-2.0.vapi
index dbdda954f8dc9b194ba1938b2c4d97dc750cbe58..7a8ea4853758e730e199e0c2fd667c4cc63ad463 100644 (file)
--- 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
similarity index 100%
rename from vapi/glib-2.0.vala
rename to vapi/glib-2.0.vapi

diff --git a/vapi/gnet-2.0.vala b/vapi/gnet-2.0.vapi
similarity index 100%
rename from vapi/gnet-2.0.vala
rename to vapi/gnet-2.0.vapi

diff --git a/vapi/gnome-desktop-2.0.vala b/vapi/gnome-desktop-2.0.vapi
similarity index 98%
rename from vapi/gnome-desktop-2.0.vala
rename to vapi/gnome-desktop-2.0.vapi
index b3344692cfa6a145a1b87d98bed41231493a0f74..64076abfcf9e86db759abbc80e6c651e271dcff4 100644 (file)
--- 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
similarity index 99%
rename from vapi/gnome-vfs-2.0.vala
rename to vapi/gnome-vfs-2.0.vapi
index a1af708afe6c0669b0d3d4877e15d17a86033287..97c3fdbb19e153cbb26701a4b8b0242dd7026fc2 100644 (file)
--- 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
similarity index 99%
rename from vapi/gstreamer-0.10.vala
rename to vapi/gstreamer-0.10.vapi
index 6214b1a4ab8cb06394dc2f12f9593818711dcc9c..5f1749e5182208a8f4fead3a144341d3144c9e1b 100644 (file)
--- 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
similarity index 99%
rename from vapi/gtk+-2.0.vala
rename to vapi/gtk+-2.0.vapi
index 56bd662e763cf42d67077fdb39ea5e4a1ac27675..ac8e71116db538805f9ac5a023b47e94b96dc37c 100644 (file)
--- 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
similarity index 100%
rename from vapi/gtkmozembed.vala
rename to vapi/gtkmozembed.vapi

diff --git a/vapi/gtksourceview-2.0.vala b/vapi/gtksourceview-2.0.vapi
similarity index 99%
rename from vapi/gtksourceview-2.0.vala
rename to vapi/gtksourceview-2.0.vapi
index e0dee6c7887e5b401984305491cbbc94e9dc1291..3b57353be884bb767107251f5d898319aa757bdb 100644 (file)
--- 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
similarity index 100%
rename from vapi/hal.vala
rename to vapi/hal.vapi

diff --git a/vapi/hildon-1.vala b/vapi/hildon-1.vapi
similarity index 99%
rename from vapi/hildon-1.vala
rename to vapi/hildon-1.vapi
index fc3675d03ff44fd44bed549c8860587b817d15b6..dae293ab983f27f5ca1a66602ce038480e00d032 100644 (file)
--- 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
similarity index 98%
rename from vapi/libglade-2.0.vala
rename to vapi/libglade-2.0.vapi
index 265022818618372301643289ac70d5af23a9a791..8d51e6cfedb0f7ca2d68d2bd16a03fd4c166b457 100644 (file)
--- 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
similarity index 99%
rename from vapi/libgnome-2.0.vala
rename to vapi/libgnome-2.0.vapi
index 6e1418da209a04f5bc44a23b5004f0bcac2870ba..3061fda48ab6ea725578604ac9a9521fa3d7f72a 100644 (file)
--- 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
similarity index 99%
rename from vapi/libgnomeui-2.0.vala
rename to vapi/libgnomeui-2.0.vapi
index f9c29c8bf9b3232e2655be2b08766e41b57dc35a..65f4b4c07a2ea83d9da0320523fed408397996c6 100644 (file)
--- 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
similarity index 97%
rename from vapi/libnotify.vala
rename to vapi/libnotify.vapi
index 3cb10a25527630cd205334a72a876318f430317e..3cc4985e63c76a0342ed5f706ebffbf6b00501ae 100644 (file)
--- 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
similarity index 100%
rename from vapi/libpanelapplet-2.0.vala
rename to vapi/libpanelapplet-2.0.vapi

diff --git a/vapi/libsoup-2.2.vala b/vapi/libsoup-2.2.vapi
similarity index 99%
rename from vapi/libsoup-2.2.vala
rename to vapi/libsoup-2.2.vapi
index 596a53f22f3bb9f83d9cff729d01b3346287d541..651757551993cf053923a0a6a9fc895cbf8ab0a2 100644 (file)
--- 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
similarity index 99%
rename from vapi/libwnck-1.0.vala
rename to vapi/libwnck-1.0.vapi
index 3f06ba4bc06ce43bb4265c8a61924b066f2f7118..5e13142831b998fcf7660968eca86b8611c41d36 100644 (file)
--- 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
similarity index 100%
rename from vapi/libxml-2.0.vala
rename to vapi/libxml-2.0.vapi

diff --git a/vapi/pango.vala b/vapi/pango.vapi
similarity index 99%
rename from vapi/pango.vala
rename to vapi/pango.vapi
index 148d064be3884be177da15f322f88657c6e047b6..e72e3734f9bb8f9a259ad424f4304273b9e92822 100644 (file)
--- 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
similarity index 99%
rename from vapi/poppler-glib.vala
rename to vapi/poppler-glib.vapi
index a811ad771d151c29d7d7f8aedf6aaadf0195ce06..7543e27dd0a2da41259b8ebb3e086a93dea3c6f3 100644 (file)
--- 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
similarity index 100%
rename from vapi/sqlite3.vala
rename to vapi/sqlite3.vapi

diff --git a/vapi/vte.vala b/vapi/vte.vapi
similarity index 99%
rename from vapi/vte.vala
rename to vapi/vte.vapi
index 91094712d567dd5c2cd432dc5ab5bae49d1e632f..d31a37f1d5d09d9a95e2d3e8c4293bb48e1f99ac 100644 (file)
--- 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
similarity index 100%
rename from vapi/zlib.vala
rename to vapi/zlib.vapi

diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index f03a12100bacea008955f50b507f14e35460f8e7..46cc773a1c4b7806e18a787140ecc13b3e4f1893 100644 (file)
--- 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