From a289233a97baee2113f8003461424ae6c17b22dc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Nov 2021 16:33:45 +0000 Subject: Ui: Fix build. --- src/client/Makefile.am | 3 +-- src/ui/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/client/Makefile.am b/src/client/Makefile.am index 60035de..4773e11 100644 --- a/src/client/Makefile.am +++ b/src/client/Makefile.am @@ -41,8 +41,7 @@ EXTRA_DIST += %reldir%/Disfluid-0.metadata %reldir%/disfluid-0-custom.vala CLEANFILES += %reldir%/vapi-generation AM_VALAFLAGS += \ - --vapidir=$(abs_top_srcdir)/%reldir% \ - --pkg=disfluid-0 + --vapidir=$(abs_top_srcdir)/%reldir% $(srcdir)/%reldir%/Disfluid-0.gir: %reldir%/Disfluid-0.h $(AM_V_GEN) $(G_IR_SCANNER) -n Disfluid --nsversion=0 --header-only --warn-all -o $@-t $< diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am index 623b66d..7fd1984 100644 --- a/src/ui/Makefile.am +++ b/src/ui/Makefile.am @@ -58,8 +58,8 @@ EXTRA_DIST += \ $(srcdir)/%reldir%/disfluid-gui-valasources.stamp: $(%canon_reldir%_disfluid_gui_VALASOURCES) $(dist_vapi_DATA) $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $^ - $(AM_V_at)for source in $^; do case $$source in *.vala) generated=$$(echo "$$source" | sed 's/\.vala$$/.c/'); (echo '#ifdef HAVE_CONFIG_H' ; echo '#include ' echo '#endif' ; cat $$generated) > $$generated-t ; mv $$generated-t $$generated ;; esac done + $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $^ -d $(srcdir)/%reldir% + $(AM_V_at)for source in $^; do case $$source in *.vala) generated=$$(echo "$$source" | sed 's/\.vala$$/.c/'); (echo '#ifdef HAVE_CONFIG_H' ; echo '#include '; echo '#endif' ; cat $$generated) > $$generated-t ; mv $$generated-t $$generated ;; esac done $(AM_V_at)mv -f $@-t $@ ## This rule is adapted from the Automake FAQ: -- cgit v1.2.3