[grilo] vala: Move variable assignments outside the conditional

[Bastien Nocera <hadess src gnome org>]

commit 52a23f13dce7b974aa0f62e437ebd6cc5e9a084b
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Mar 2 12:03:04 2016 +0100

    vala: Move variable assignments outside the conditional
    
    Otherwise EXTRA_DIST and co. aren't actually getting set if we're not
    compiling with Vala.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761820

 bindings/vala/Makefile.am |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 5145774..8c726ef 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -1,33 +1,32 @@
 EXTRA_DIST =
 CLEANFILES =
 
+VAPIGEN_VAPIS = grilo- GRL_MAJORMINOR@.vapi grilo-net- GRL_MAJORMINOR@.vapi
+
 if ENABLE_VAPIGEN
 -include $(VAPIGEN_MAKEFILE)
 
-VAPIGEN_VAPIS = grilo- GRL_MAJORMINOR@.vapi grilo-net- GRL_MAJORMINOR@.vapi
-
 grilo- GRL_MAJORMINOR@.vapi: $(top_builddir)/src/Grl- GRL_MAJORMINOR@.gir grilo- GRL_MAJORMINOR@-custom.vala 
grilo- GRL_MAJORMINOR@.deps Grl- GRL_MAJORMINOR@.metadata
 
 grilo_ GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0
 grilo_ GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir)
 grilo_ GRL_MAJORMINOR_NORM@_vapi_FILES = $(srcdir)/grilo- GRL_MAJORMINOR@-custom.vala 
$(top_builddir)/src/Grl- GRL_MAJORMINOR@.gir
 
-EXTRA_DIST += Grl- GRL_MAJORMINOR@.metadata grilo- GRL_MAJORMINOR@.deps grilo- GRL_MAJORMINOR@-custom.vala
-
 grilo-net- GRL_MAJORMINOR@.vapi:  $(top_builddir)/libs/net/GrlNet- GRL_MAJORMINOR@.gir grilo-net- 
GRL_MAJORMINOR@-custom.vala grilo-net- GRL_MAJORMINOR@.deps GrlNet- GRL_MAJORMINOR@.metadata
 
 grilo_net_ GRL_MAJORMINOR_NORM@_vapi_DEPS = gio-2.0
 grilo_net_ GRL_MAJORMINOR_NORM@_vapi_METADATADIRS = $(srcdir)
 grilo_net_ GRL_MAJORMINOR_NORM@_vapi_FILES = $(srcdir)/grilo-net- GRL_MAJORMINOR@-custom.vala 
$(top_builddir)/libs/net/GrlNet- GRL_MAJORMINOR@.gir
 
-EXTRA_DIST += GrlNet- GRL_MAJORMINOR@.metadata grilo-net- GRL_MAJORMINOR@.deps grilo-net- 
GRL_MAJORMINOR@-custom.vala
-
 vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
+endif
+
+EXTRA_DIST += Grl- GRL_MAJORMINOR@.metadata grilo- GRL_MAJORMINOR@.deps grilo- GRL_MAJORMINOR@-custom.vala
+EXTRA_DIST += GrlNet- GRL_MAJORMINOR@.metadata grilo-net- GRL_MAJORMINOR@.deps grilo-net- 
GRL_MAJORMINOR@-custom.vala
+
 CLEANFILES += $(VAPIGEN_VAPIS)
 MAINTAINERCLEANFILES = $(VAPIGEN_VAPIS:.vapi=.deps)
 
-endif
-
 -include $(top_srcdir)/git.mk