[alacarte/vala+gdesktopmenu] make distcheck work

[Trevor Watkins <twatkins src gnome org>]

commit bdcdef0858adee63fb628098e168bf23f9dd5067
Author: Travis Watkins <amaranth ubuntu com>
Date:   Wed May 6 02:28:34 2009 -0500

    make distcheck work
---
 Makefile.am      |    1 +
 configure.ac     |    1 +
 src/Makefile.am  |    8 ++++++--
 vapi/Makefile.am |    5 +++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6962579..1c0f65f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ SUBDIRS = \
 	data \
 	src \
 	po \
+	vapi \
 	$(NULL)
 
 CLEANFILES=
diff --git a/configure.ac b/configure.ac
index 250a97b..9af4a02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AC_CONFIG_FILES([Makefile
 	data/alacarte.desktop.in
 	data/icons/Makefile
 	src/Makefile
+	vapi/Makefile
 	po/Makefile.in])
 
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 895b353..92d374e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,12 +14,12 @@ alacarte_VALASOURCES = \
 	$(NULL)
 
 alacarte_SOURCES = \
+	alacarte.vala.stamp \
 	$(alacarte_VALASOURCES:.vala=.c) \
-	$(alacarte_VALASOURCES:.vala=.h) \
 	$(NULL)
 
 alacarte.vala.stamp: $(alacarte_VALASOURCES)
-	$(VALAC) -C --pkg gtk+-2.0 --pkg glib-2.0 --pkg gmodule-2.0 --vapidir=$(top_srcdir)/vapi --pkg libxfce4menu-0.1 --basedir $(top_srcdir)/src $^
+	$(VALAC) -C --pkg gtk+-2.0 --pkg glib-2.0 --pkg gmodule-2.0 --vapidir=$(srcdir)/../vapi --pkg libxfce4menu-0.1 $^
 	touch $@
 
 alacarte_LDADD = \
@@ -44,6 +44,10 @@ EXTRA_DIST = \
 	config.vala.in \
 	$(NULL)
 
+MAINTAINERCLEANFILES = \
+	$(alacarte_VALASOURCES:.vala=.c) \
+	$(NULL)
+
 CLEANFILES = config.vala
 
 all-local: config.vala
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
new file mode 100644
index 0000000..7844f13
--- /dev/null
+++ b/vapi/Makefile.am
@@ -0,0 +1,5 @@
+NULL = 
+
+EXTRA_DIST = \
+	libxfce4menu-0.1.vapi \
+	$(NULL)