[Xfce4-commits] [xfce/libxfce4ui] 01/02: Fix make distcheck

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit c029290d91f2fe37dfdaacdee79c48c120b135ba
Author: Romain B <skunnyk at alteroot.org>
Date:   Mon Nov 27 18:40:53 2017 +0100

    Fix make distcheck
    
    - distcheck is broken since the introduction of vala binding generation.
    - We don't need to generate them on release tarball, we only need to
    provides needed files
    - Disable vala in DISTCHECK_CONFIGURE_FLAGS
    - This fix bug #14039
    - Also remove the 'empty' useless .vapi file
---
 Makefile.am                  | 3 ++-
 libxfce4ui/Makefile.am       | 2 +-
 libxfce4ui/libxfce4ui-2.vapi | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 946ede3..62abdd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ DISTCLEANFILES = \
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--disable-gladeui \
-	--enable-introspection
+	--enable-introspection \
+	--enable-vala=no
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/libxfce4ui/Makefile.am b/libxfce4ui/Makefile.am
index 91b388d..0414d75 100644
--- a/libxfce4ui/Makefile.am
+++ b/libxfce4ui/Makefile.am
@@ -278,7 +278,7 @@ libxfce4ui_2_vapi_FILES = libxfce4ui-2.0.gir
 vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
 
-EXTRA_DIST += libxfce4ui-2.metadata libxfce4ui-2.deps
+EXTRA_DIST += libxfce4ui-2.0.metadata libxfce4ui-2.deps
 endif
 
 if HAVE_GNUC_VISIBILITY
diff --git a/libxfce4ui/libxfce4ui-2.vapi b/libxfce4ui/libxfce4ui-2.vapi
deleted file mode 100644
index d8978b4..0000000
--- a/libxfce4ui/libxfce4ui-2.vapi
+++ /dev/null
@@ -1 +0,0 @@
-/* libxfce4ui-2.vapi generated by vapigen-0.36, do not modify. */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.