From 677d08ddeff8bde164fd01f7a6d19ec4bb42adcf Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Fri, 1 Aug 2025 20:42:26 +0200 Subject: Inline calls only required for demos LIB_3 and LIB_4 are only used to build the demos, but are initialised unconditionally. This requires pkg-config, gtk+3.0-dev and gtk4.0-dev. Inline this initialisation, so that pkg-config, gtk3 and gtk4 are only required when building the demos (or gtk bindings), but not for building hare-gi itself. --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 473649f..3b58a17 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,6 @@ MODULES_GTK4 = \ gi/graphene \ gi/gsk -LIBS_3 != pkg-config --libs-only-l gtk+-3.0 -LIBS_4 != pkg-config --libs-only-l gtk4 - HARE_GI_SRC != find cmd/hare-gi/ -name '*.ha' GIR_SRC != find gir/ -name '*.ha' FORMAT_FASTXML_SRC != find format/fastxml/ -name '*.ha' @@ -79,10 +76,10 @@ uninstall-gtk4: @./scripts/uninstall-modules "$(DESTDIR)$(THIRDPARTYDIR)" $(MODULES_GTK4) demo-gtk3: .gen - hare build $(LIBS_3) -o demo-gtk3 cmd/demo-gtk3 + hare build $(shell pkg-config --libs-only-l gtk+-3.0) -o demo-gtk3 cmd/demo-gtk3 demo-gtk4: .gen - hare build $(LIBS_4) -o demo-gtk4 cmd/demo-gtk4 + hare build $(shell pkg-config --libs-only-l gtk4) -o demo-gtk4 cmd/demo-gtk4 clean: rm -f hare-gi xmltree demo-gtk3 demo-gtk4 gi/*/_generate.ha -- cgit 1.3.0-6-gf8a5