xim: run server inside strans

Makefile

@@ -2,8 +2,10 @@ CC = 9c
 LD = 9l
 PKG_CFLAGS = $(shell pkg-config --cflags dbus-1 xkbcommon)
 PKG_LIBS = $(shell pkg-config --libs dbus-1 xkbcommon)
-TEXT_CFLAGS = $(shell pkg-config --cflags 'pangocairo >= 1.56' 'cairo >= 1.18')
-TEXT_LIBS = $(shell pkg-config --libs 'pangocairo >= 1.56' 'cairo >= 1.18')
+XIM_CFLAGS = $(shell pkg-config --cflags xcb-imdkit xkbcommon)
+XIM_LIBS = $(shell pkg-config --libs xcb-imdkit xkbcommon)
+TEXT_CFLAGS = $(shell pkg-config --cflags pangocairo cairo)
+TEXT_LIBS = $(shell pkg-config --libs pangocairo cairo)
 CFLAGS = -Wall -Wextra -O2 -g $(PKG_CFLAGS)
 PROG = strans
 DOCKER_IMAGE = strans-build
@@ -12,15 +14,19 @@ DOCKER_RUN = docker run --rm --user "$$(id -u):$$(id -g)" \
 
 SRCS = dict.c font.c hash.c ibus.c ipc.c ko.c main.c popup_layout.c \
 	srv.c str.c strans.c trie.c vi.c win.c
-OBJS = $(SRCS:.c=.o)
+XIMSRCS = xim/xim.c xim/keymap.c xim/ximtext.c
+XIMOBJS = $(XIMSRCS:.c=.o)
+OBJS = $(SRCS:.c=.o) $(XIMOBJS)
 
-all: $(PROG) xim gtk
+all: $(PROG) gtk
 
 $(PROG): $(OBJS)
-	$(LD) -o $@ $(OBJS) -lthread -lbio -lxcb $(PKG_LIBS) $(TEXT_LIBS)
+	$(LD) -o $@ $(OBJS) -lthread -lbio -lxcb $(PKG_LIBS) $(TEXT_LIBS) \
+		$(XIM_LIBS)
 
 $(OBJS): dat.h fn.h ipc.h
 font.o: CFLAGS += $(TEXT_CFLAGS)
+$(XIMOBJS): CFLAGS += -I. $(XIM_CFLAGS)
 
 clean:
 	rm -f $(OBJS) $(PROG)
@@ -29,9 +35,6 @@ clean:
 	$(MAKE) -C gtk/ clean
 	$(MAKE) -C bench/ clean
 
-xim:
-	$(MAKE) -C xim/
-
 gtk:
 	$(MAKE) -C gtk/
 
@@ -68,5 +71,5 @@ verify-map:
 	python3 -B tests/mkhanja_test.py
 	python3 -B tests/skk2ktrans_test.py
 
-.PHONY: all check test verify-map clean xim gtk bench docker docker-image \
+.PHONY: all check test verify-map clean gtk bench docker docker-image \
 	docker-build docker-check docker-bench