diff options
| author | Vivien Kraus <vivien@planete-kraus.eu> | 2021-11-17 16:33:45 +0000 |
|---|---|---|
| committer | Vivien Kraus <vivien@planete-kraus.eu> | 2021-11-17 16:58:37 +0000 |
| commit | a289233a97baee2113f8003461424ae6c17b22dc (patch) | |
| tree | 2fd58deff6794945a5690146f83b8c584963ab51 | |
| parent | 2164ca1f095dc7d516cad3f471a9b500981c421c (diff) | |
Ui: Fix build.
| -rw-r--r-- | src/client/Makefile.am | 3 | ||||
| -rw-r--r-- | 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 <config.h>' 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 <config.h>'; 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: |