From 9add4076d2ec4f4bf33c19ac1a18347dd3bc1d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 30 Mar 2011 19:14:53 +0200
Subject: [PATCH] build: fix make dist

---
 autogen.sh                 |  2 +-
 configure.ac               |  2 +-
 data/Makefile.am           |  1 +
 gtk/Makefile.am            |  5 ++---
 gtk/controller/Makefile.am | 41 ++++++++++++++++++++++++++++----------
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 7650d6b..904c00e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=.
 gtkdocize
 autoreconf -v --force --install
 intltoolize -f
-if test ! -e gtk/controller/controller.stamp; then
+if test ! -e gtk/controller/controller.vala.stamp; then
   enable_vala="--enable-vala"
 fi
 
diff --git a/configure.ac b/configure.ac
index 45f379e..20396d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -489,7 +489,7 @@ AC_MSG_RESULT([$warn_unused_result])
 
 AC_SUBST(SPICE_CFLAGS)
 
-SPICE_GLIB_CFLAGS="$PROTOCOL_CFLAGS $PIXMAN_CFLAGS $CELT051_CFLAGS $PULSE_CFLAGS $GST_CFLAGS $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS @SASL_CFLAGS"
+SPICE_GLIB_CFLAGS="$PROTOCOL_CFLAGS $PIXMAN_CFLAGS $CELT051_CFLAGS $PULSE_CFLAGS $GST_CFLAGS $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS $SASL_CFLAGS"
 SPICE_GTK_CFLAGS="$SPICE_GLIB_CFLAGS $GTK_CFLAGS "
 
 AC_SUBST(SPICE_GLIB_CFLAGS)
diff --git a/data/Makefile.am b/data/Makefile.am
index d6764f2..e5dbad3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,6 +14,7 @@ NULL=
 EXTRA_DIST =					\
 	spicy-for-windows.nsis			\
 	spice-mime.xml.in spicy.desktop.in      \
+	spice-protocol.vapi			\
 	$(desktop_in_files)			\
 	$(NULL)
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3fd206f..ade13c3 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -262,16 +262,15 @@ displaysrc = \
 	display/gnome-rr-config.c		\
 	display/gnome-rr-config.h		\
 	display/gnome-rr-output-info.c		\
-	display/gnome-rr-output-info.h		\
 	display/gnome-rr-private.h		\
 	display/gnome-rr.c			\
 	display/gnome-rr.h			\
 	$(NULL)
 
 if WITH_DISPLAY_X11
-displaysrc += display/gnome-rr-x11.c
+displaysrc += display/gnome-rr-x11.c display/gnome-rr-x11.h
 else
-displaysrc += display/gnome-rr-windows.c
+displaysrc += display/gnome-rr-windows.c display/gnome-rr-windows.h
 endif
 
 spicy_SOURCES =					\
diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
index 6859b5b..5c73f72 100644
--- a/gtk/controller/Makefile.am
+++ b/gtk/controller/Makefile.am
@@ -2,14 +2,7 @@ NULL =
 
 AM_CPPFLAGS = $(GIO_CFLAGS) $(PROTOCOL_CFLAGS)
 AM_LDFLAGS = $(GIO_LIBS)
-noinst_LIBRARIES = libcontroller.a
-noinst_PROGRAMS = test-controller
-
-libcontroller_a_SOURCES =			\
-	menu.vala				\
-	controller.vala				\
-	$(NULL)
-libcontroller_a_VALAFLAGS =					\
+AM_VALAFLAGS =							\
 	--pkg gio-2.0						\
 	--pkg spice-protocol --vapidir=$(top_srcdir)/data	\
 	--pkg custom --vapidir=$(srcdir)			\
@@ -17,13 +10,39 @@ libcontroller_a_VALAFLAGS =					\
 	$(NULL)
 
 if OS_WIN32
-libcontroller_a_VALAFLAGS += --pkg gio-windows-2.0
+AM_VALAFLAGS += --pkg gio-windows-2.0
 else
-libcontroller_a_VALAFLAGS += --pkg gio-unix-2.0
+AM_VALAFLAGS += --pkg gio-unix-2.0
 endif
 
+if !OS_WIN32
+noinst_LTLIBRARIES = libcontroller.la
+noinst_PROGRAMS = test-controller
+endif
+
+BUILT_SOURCES = controller.vala.stamp
+
+libcontroller_la_VALASOURCES =			\
+	menu.vala				\
+	controller.vala				\
+	$(NULL)
+libcontroller_la_SOURCES = \
+	custom.h				\
+	$(libcontroller_la_VALASOURCES:.vala=.c)
+
 test_controller_SOURCES = test.c
-test_controller_LDADD = libcontroller.a
+test_controller_LDADD = libcontroller.la
+
+controller.vala.stamp: $(libcontroller_la_VALASOURCES) custom.vapi
+	$(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $^
+	@touch $@
+
+EXTRA_DIST =					\
+	$(libcontroller_la_VALASOURCES)		\
+	controller.h				\
+	controller.vala.stamp			\
+	custom.vapi				\
+	$(NULL)
 
 vala-clean:
 	rm -f `find . -name "*.stamp"`