[libdmapsharing] Ensure vala is optional

[W. Michael Petullo <wmpetullo src gnome org>]

commit 90ce9d39830edfeac9907fc90c3034221c579f45
Author: W. Michael Petullo <mike flyn org>
Date:   Tue Jun 30 20:28:59 2020 -0500

    Ensure vala is optional

 tests/Makefile.am | 6 +++---
 vala/Makefile.am  | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index db41efd..486cf2f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,9 +1,11 @@
 if TESTS_ENABLED
 noinst_PROGRAMS = test-dmap-client test-dmap-server
 
+if BUILD_VAPI
 if HAVE_GEE
 noinst_PROGRAMS += dacplisten dpapview dmapcopy dmapserve
 endif
+endif
 
 # Automake documentation mentions LDADD, but it does not work;
 # LIBS does.
@@ -12,7 +14,6 @@ LIBS += $(top_builddir)/libdmapsharing/libdmapsharing-4.0.la
 if HAVE_CHECK
 noinst_PROGRAMS += unit-test
 endif
-endif
 
 test_dmap_client_SOURCES = \
        test-dmap-client.c
@@ -41,7 +42,6 @@ test_dmap_server_LDADD = \
        $(MDNS_LIBS)
 
 if HAVE_VALAC
-if TESTS_ENABLED
 BUILT_SOURCES = dacplisten.stamp dpapview.stamp dmapcopy.stamp dmapserve.stamp
 endif
 
@@ -60,7 +60,6 @@ dmapcopy.stamp: $(dmapcopy_VALASOURCES)
 dmapserve.stamp: $(dmapserve_VALASOURCES)
        $(VALAC) --vapidir=../vala --pkg gee-0.8 --pkg gstreamer-1.0 --pkg libdmapsharing-4.0 --pkg 
libsoup-2.4 --pkg gio-2.0 --pkg avahi-gobject $^ -C
        touch $@
-endif
 
 dacplisten_VALASOURCES = \
        dacplisten.vala \
@@ -152,3 +151,4 @@ CLEANFILES = \
        $(BUILT_SOURCES) \
        $(dpapview_VALABUILTSOURCES)
 endif
+endif
diff --git a/vala/Makefile.am b/vala/Makefile.am
index d08c6c6..3f2e7cb 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -7,7 +7,6 @@ libdmapsharing-@API_VERSION@.vapi: libdmapsharing-@API_VERSION@.gi libdmapsharin
        $(VAPIGEN) --pkg=avahi-gobject --pkg=libsoup-2.4 --pkg=glib-2.0 --pkg=gio-2.0 --pkg=gstreamer-1.0 
--library libdmapsharing-@API_VERSION@ libdmapsharing-@API_VERSION@.gi
 
 all: libdmapsharing-@API_VERSION@.vapi
-endif
 
 vapidir = $(datadir)/vala/vapi
 
@@ -28,7 +27,6 @@ CLEANFILES = \
 DISTCLEANFILES = \
        libdmapsharing-@API_VERSION@-uninstalled.files
 
-if BUILD_VAPI
 CLEANFILES += \
        libdmapsharing-@API_VERSION@.vapi
 endif