[valadoc] Remove the vapis from git and fix Makefiles

[Florian Brosch <flobrosch src gnome org>]

commit a8a54a71981af4bdeeada1e1cfa398c63adb5fd6
Author: Didier 'Ptitjes <ptitjes free fr>
Date:   Fri Oct 16 16:37:33 2009 +0200

    Remove the vapis from git and fix Makefiles

 configure.in                                       |    1 -
 src/Makefile.am                                    |    1 -
 .../htmlhelpers/doclet/libhtmlhelpers-1.0.vapi     |  366 -------
 src/libvaladoc/Makefile.am                         |    6 +
 src/{vapi => libvaladoc}/valadoc-1.0.deps          |    0
 src/libvaladoc/valadoc-1.0.vapi                    | 1030 --------------------
 src/valadoc/Makefile.am                            |    4 +-
 src/vapi/Makefile.am                               |   19 -
 src/vapi/valadoc-1.0.vapi                          | 1030 --------------------
 9 files changed, 8 insertions(+), 2449 deletions(-)
---
diff --git a/configure.in b/configure.in
index 37baa2b..edbf8aa 100644
--- a/configure.in
+++ b/configure.in
@@ -65,7 +65,6 @@ AC_CONFIG_FILES([Makefile
                  src/libvaladoc/valadoc-1.0.pc
                  src/Makefile
                  src/libvaladoc/Makefile
-                 src/vapi/Makefile
                  src/doclets/Makefile
                  src/doclets/htmlhelpers/Makefile
                  src/doclets/htmlhelpers/deps/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index a8c69a6..6cd599a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,6 @@ NULL =
 
 SUBDIRS = \
     libvaladoc \
-    vapi \
     valadoc \
 	doclets \
     $(NULL)
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index ac9ddc2..5aca3a8 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -174,3 +174,9 @@ MAINTAINERCLEANFILES =                    \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = valadoc-1.0.pc
 
+vapidir = $(datadir)/vala/vapi
+vapi_DATA =     \
+	valadoc-1.0.vapi \
+	valadoc-1.0.deps \
+	$(NULL)
+
diff --git a/src/vapi/valadoc-1.0.deps b/src/libvaladoc/valadoc-1.0.deps
similarity index 100%
rename from src/vapi/valadoc-1.0.deps
rename to src/libvaladoc/valadoc-1.0.deps
diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am
index 49778e2..4759dec 100644
--- a/src/valadoc/Makefile.am
+++ b/src/valadoc/Makefile.am
@@ -40,8 +40,8 @@ valadoc_LDADD =                 \
 	$(NULL)
 
 
-valadoc.vala.stamp: $(libvaladoc_VALASOURCES)
-	$(VALAC) -C -H valadoc.h --pkg gee-1.0 --pkg gmodule-2.0 --pkg config --vapidir ../vapi --pkg valadoc-1.0 --basedir $(top_srcdir)/src/valadoc/ valadoc.vala --save-temps $^
+valadoc.vala.stamp: $(valadoc_VALASOURCES)
+	$(VALAC) -C --pkg gee-1.0 --pkg gmodule-2.0 --vapidir ../vapi/ --pkg config --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
 	touch $@