From c48850179bca6e08c97e4d4c13ad257fac8e2ab8 Mon Sep 17 00:00:00 2001 From: Romain B Date: Mon, 27 Nov 2017 18:40:53 +0100 Subject: [PATCH] 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(-) delete mode 100644 libxfce4ui/libxfce4ui-2.vapi 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. */ -- 2.15.0