From 0a99dbb31898b8196c3e6a6cfa36ff790e3a69f5 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 28 Jun 2026 14:34:38 -0700
Subject: oni-yasnippet: Set up multi-file build

This package now contains all of my snippets, instead of having them distributed
across multiple packages. I hope that this will make them easier to manage and
keep updated.
---
 GNUmakefile         | 14 ++++++++++----
 oni-yasnippet/Eldev | 13 +++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 oni-yasnippet/Eldev

diff --git a/GNUmakefile b/GNUmakefile
index fb20f5b..6d54bff 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -133,7 +133,7 @@ package: \
         bin/$(guile (get-module-version "oni-vterm")) \
         bin/$(guile (get-module-version "oni-web")) \
         bin/$(guile (get-module-version "oni-yaml")) \
-        bin/$(guile (get-module-version "oni-yasnippet")) \
+        bin/$(guile (get-multifile-module-version "oni-yasnippet")) \
 
 install-%:
 	emacs --batch \
@@ -157,9 +157,6 @@ integration-test-%: install-%
 
 ## Single-file packages
 
-bin/$(guile (get-module-version "oni-yasnippet")): oni-yasnippet.el
-	$(call upload,\"$<\")
-
 bin/$(guile (get-module-version "oni-smartparens")): oni-smartparens.el
 	$(call upload,\"$<\")
 
@@ -546,3 +543,12 @@ bin/$(guile (get-multifile-module-version "oni-twig")): \
         oni-twig/dist/$(guile (get-multifile-module-version "oni-twig"))
 	$(call upload-multi-file,oni-twig)
 
+## oni-yasnippet
+
+oni-yasnippet/dist/$(guile (get-multifile-module-version "oni-yasnippet")): \
+        oni-yasnippet/oni-yasnippet.el
+	cd oni-yasnippet && eldev package
+
+bin/$(guile (get-multifile-module-version "oni-yasnippet")): \
+        oni-yasnippet/dist/$(guile (get-multifile-module-version "oni-yasnippet"))
+	$(call upload-multi-file,oni-yasnippet)
diff --git a/oni-yasnippet/Eldev b/oni-yasnippet/Eldev
new file mode 100644
index 0000000..3a4fe49
--- /dev/null
+++ b/oni-yasnippet/Eldev
@@ -0,0 +1,13 @@
+; -*- mode: emacs-lisp; lexical-binding: t -*-
+
+;; Uncomment some calls below as needed for your project.
+(eldev-use-package-archive 'gnu-elpa)
+;(eldev-use-package-archive 'nongnu-elpa)
+(eldev-use-package-archive 'melpa)
+(eldev-use-package-archive `("oni" . ,(expand-file-name "../bin")))
+
+(eldev-use-plugin 'autoloads)
+
+(setf eldev-files-to-package
+      `(:or ,eldev-files-to-package
+            '("*.el" "snippets/**/*")))
-- 
cgit v1.3-2-g0d8e