1 files changed, 32 insertions, 5 deletions
diff --git a/src/vala/Makefile.am b/src/vala/Makefile.am
index acbb494..a0e4279 100644
--- a/src/vala/Makefile.am
+++ b/src/vala/Makefile.am
@@ -1,6 +1,3 @@
-introspection/Disfluid-$(DLL_VERSION).gir:
-	$(MAKE) $(AM_MAKEFLAGS) -C introspection Disfluid-$(DLL_VERSION).gir
-
 vapidir = $(datarootdir)/vala/vapi
 
 dist_vapi_DATA = %D%/disfluid-$(DLL_VERSION).vapi
@@ -10,5 +7,35 @@ VAPIGEN_VERBOSE_ = $(VAPIGEN_VERBOSE_@AM_DEFAULT_V@)
 VAPIGEN_VERBOSE_1 = $(VAPIGEN)
 VAPIGEN_VERBOSE_0 = @echo "  VAPIGEN " $@; $(VAPIGEN) --quiet
 
-%D%/disfluid-$(DLL_VERSION).vapi: introspection/Disfluid-$(DLL_VERSION).gir
-	$(AM_VAPIGEN) --library=disfluid-$(DLL_VERSION) -d $(srcdir)/%D% $(srcdir)/introspection/Disfluid-$(DLL_VERSION).gir
+%D%/disfluid-$(DLL_VERSION).vapi: $(dist_gir_DATA)
+	@$(MKDIR_P) %D%/vapi-t
+	$(AM_VAPIGEN) --library=disfluid-$(DLL_VERSION) -d %D%/vapi-t $(dist_gir_DATA) && mv %D%/vapi-t/disfluid-$(DLL_VERSION).vapi %D%/disfluid-$(DLL_VERSION).vapi-t && rmdir %D%/vapi-t && mv %D%/disfluid-$(DLL_VERSION).vapi-t $(srcdir)/%D%/disfluid-$(DLL_VERSION).vapi
+
+AM_VALAFLAGS = --pkg gtk4 --pkg libadwaita-1
+
+if WITH_GTK
+bin_PROGRAMS += %D%/disfluid
+
+%C%_disfluid_SOURCES = \
+  %D%/main.vala \
+  %D%/about.vala \
+  %D%/cache_entry_widget.vala \
+  %D%/main_window.vala \
+  %D%/disfluid-$(DLL_VERSION).vapi
+
+%C%_disfluid_CPPFLAGS = \
+  -I include -I $(srcdir)/include \
+  -I %D% -I $(srcdir)/%D% \
+  -include config.h \
+  $(GTK_CFLAGS) $(GOBJECT_CFLAGS) $(ADW_CFLAGS)
+
+%C%_disfluid_CFLAGS = \
+  $(GTK_CFLAGS) $(GOBJECT_CFLAGS) $(ADW_CFLAGS)
+
+%C%_disfluid_LDADD = \
+  src/libdisfluid/libdisfluid.la \
+  src/gobject/libdisfluid-gobject.la
+
+%C%_disfluid_LDFLAGS = \
+  $(GTK_LIBS) $(GOBJECT_LIBS) $(ADW_LIBS)
+endif