Merge remote-tracking branch 'rhansen/build'

rvaiya/keyd#642
keyd-project · Dec 6, 2024 · 8c28ad2 · 8c28ad2
2 parents 393d341 + 7ac6676
commit 8c28ad2
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 34,533 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1 @@
-data/* -diff
 layouts/* -diff
-src/unicode.c -diff
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,6 @@ bin/
 __pycache__
 test.log
 keyd.service
+/data/*.1.gz
+/data/keyd.compose
+/src/unicode.c
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ else
 	COMPAT_FILES=
 endif
 
-all:
+all: compose man
 	-mkdir bin
 	cp scripts/keyd-application-mapper bin/
 	$(CC) $(CFLAGS) -O3 $(COMPAT_FILES) src/*.c src/vkbd/$(VKBD).c -lpthread -o bin/keyd $(LDFLAGS)
@@ -91,7 +91,7 @@ uninstall:
 		$(DESTDIR)$(PREFIX)/bin/keyd-usb-gadget.sh \
 		$(DESTDIR)$(PREFIX)/lib/systemd/system/keyd.service
 clean:
-	-rm -rf bin keyd.service src/vkbd/usb-gadget.service
+	rm -rf bin data/*.1.gz data/keyd.compose keyd.service src/unicode.c src/vkbd/usb-gadget.service
 test:
 	@cd t; \
 	for f in *.sh; do \

diff --git a/data/keyd-application-mapper.1.gz b/data/keyd-application-mapper.1.gz
diff --git a/data/keyd.1.gz b/data/keyd.1.gz