From fd40e4a38c5221fb7656582cbccb577bfc3fa649 Mon Sep 17 00:00:00 2001
From: Tokuhiro Matsuno <tokuhirom@gmail.com>
Date: Sat, 28 Jan 2023 22:33:34 +0900
Subject: [PATCH] =?UTF-8?q?`make`=20=E6=99=82=E3=81=AB=20target/=20?=
 =?UTF-8?q?=E3=82=92=20root=20=E6=A8=A9=E9=99=90=E3=81=A7=E8=A7=A6?=
 =?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile            | 9 ++++++++-
 README.md           | 3 ++-
 ibus-akaza/Makefile | 8 ++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 712660f..ec7eb92 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 PREFIX ?= /usr
 DATADIR ?= $(PREFIX)/share
 
+all:
+	$(MAKE) -C ibus-akaza all
+
 install: install-resources
 	$(MAKE) -C ibus-akaza install
 
@@ -8,5 +11,9 @@ install-resources:
 	install -m 0644 -v -D -t $(DATADIR)/akaza/romkan romkan/*
 	install -m 0644 -v -D -t $(DATADIR)/akaza/keymap keymap/*
 
-.PHONY: install install-resources
+clean:
+	cargo clean
+	$(MAKE) -C ibus-akaza clean
+
+.PHONY: all install install-resources clean
 
diff --git a/README.md b/README.md
index 78643fd..ce103a8 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,8 @@ Rust で書いています。
 
 ibus-akaza をインストールしてください。
 
-    sudo rustup install stable
+    rustup install stable
+    make
     sudo make install
     ibus restart
     ibus engine akaza
diff --git a/ibus-akaza/Makefile b/ibus-akaza/Makefile
index 321e800..399e32e 100644
--- a/ibus-akaza/Makefile
+++ b/ibus-akaza/Makefile
@@ -4,7 +4,7 @@ DATADIR ?= $(PREFIX)/share
 DESTDIR ?=
 AKAZA_DATA_DIR ?= $(DATADIR)/akaza/
 
-all: akaza.xml config.h
+all: akaza.xml config.h ../target/release/ibus-akaza
 
 #   ibus_akaza/config.py: ibus_akaza/config.py.in
 #   	sed -e "s:@SYSCONFDIR@:$(SYSCONFDIR):g" \
@@ -27,13 +27,13 @@ akaza-debug.xml: akaza.xml.in
 	    -e "s:@BINARY@:$(PWD)/ibus-akaza-debug.sh:g" \
 	    -e "s:@DATADIR@:$(DATADIR)/:g" $< > $@
 
-install: akaza.xml config.h .ibus-akaza
+install: akaza.xml config.h ../target/release/ibus-akaza
 	install -m 0644 ../target/release/ibus-akaza $(PREFIX)/bin/
 
 	install -m 0644 akaza.svg $(DESTDIR)$(DATADIR)/ibus-akaza
 	install -m 0644 akaza.xml $(DESTDIR)$(DATADIR)/ibus/component
 
-.ibus-akaza:
+../target/release/ibus-akaza:
 	cargo build --release
 
 install-debug: akaza-debug.xml
@@ -46,7 +46,7 @@ uninstall:
 	rm -f $(DESTDIR)$(DATADIR)/ibus-akaza/akaza.svg
 
 clean:
-	rm -f akaza.xml
+	rm -f akaza.xml config.h
 
 .PHONY: all test install uninstall clean install-debug