diff -r 0a9f4d689c12 -r 96c202d45fbb ui/server/Makefile
--- a/ui/server/Makefile	Mon Jun 01 20:29:26 2026 +0200
+++ b/ui/server/Makefile	Tue Jun 02 19:30:34 2026 +0200
@@ -26,11 +26,69 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-$(SERVER_OBJPRE)%.o: server/%.c
-	$(CC) -o $@ -c -I../ucx $(CFLAGS) $(SHLIB_CFLAGS) $(TK_CFLAGS) $<
-
 $(UI_LIB): $(OBJ)
-	$(AR) $(ARFLAGS) $(UI_LIB) $(OBJ)	
+	$(AR) $(ARFLAGS) $(UI_LIB) $(OBJ)
 
 $(UI_SHLIB): $(OBJ)
 	$(CC) -o $(UI_SHLIB) $(LDFLAGS) $(SHLIB_LDFLAGS) $(TK_LDFLAGS) $(OBJ) -L../build/lib -lucx
+
+FORCE:
+
+$(SERVER_OBJPRE)args.o: server/args.c server/args.h server/toolkit.h \
+ server/../ui/toolkit.h server/../common/context.h \
+ server/../common/../ui/toolkit.h server/../common/action.h \
+ server/../common/object.h server/../common/utils.h \
+ server/../common/../ui/text.h server/../common/../ui/toolkit.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+
+$(SERVER_OBJPRE)button.o: server/button.c server/button.h \
+ server/toolkit.h server/../ui/toolkit.h server/../common/context.h \
+ server/../common/../ui/toolkit.h server/../common/action.h \
+ server/../common/object.h server/../ui/button.h server/../ui/toolkit.h \
+ server/args.h server/container.h server/../common/container.h \
+ server/../common/../ui/container.h server/../common/../ui/toolkit.h \
+ server/widget.h server/../ui/widget.h server/var.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+
+$(SERVER_OBJPRE)container.o: server/container.c server/container.h \
+ server/toolkit.h server/../ui/toolkit.h server/../common/context.h \
+ server/../common/../ui/toolkit.h server/../common/action.h \
+ server/../common/object.h server/../common/container.h \
+ server/../common/../ui/container.h server/../common/../ui/toolkit.h \
+ server/widget.h server/../ui/widget.h server/../ui/toolkit.h \
+ server/args.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+
+$(SERVER_OBJPRE)image.o: server/image.c server/image.h \
+ server/../ui/image.h server/../ui/toolkit.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+
+$(SERVER_OBJPRE)toolkit.o: server/toolkit.c server/toolkit.h \
+ server/../ui/toolkit.h server/../common/context.h \
+ server/../common/../ui/toolkit.h server/../common/action.h \
+ server/../common/object.h server/../common/message.h \
+ server/../common/threadpool.h server/../common/app.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+
+$(SERVER_OBJPRE)var.o: server/var.c server/toolkit.h \
+ server/../ui/toolkit.h server/../common/context.h \
+ server/../common/../ui/toolkit.h server/../common/action.h \
+ server/../common/object.h server/var.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+
+$(SERVER_OBJPRE)widget.o: server/widget.c server/widget.h \
+ server/../ui/widget.h server/../ui/toolkit.h server/toolkit.h \
+ server/../ui/toolkit.h server/../common/context.h \
+ server/../common/../ui/toolkit.h server/../common/action.h \
+ server/../common/object.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+
+$(SERVER_OBJPRE)window.o: server/window.c server/window.h \
+ server/../ui/window.h server/../ui/toolkit.h server/toolkit.h \
+ server/../ui/toolkit.h server/../common/context.h \
+ server/../common/../ui/toolkit.h server/../common/action.h \
+ server/../common/object.h server/container.h \
+ server/../common/container.h server/../common/../ui/container.h \
+ server/../common/../ui/toolkit.h server/widget.h server/../ui/widget.h
+	$(CC) -o $@ $(CFLAGS) -I../ucx $(SHLIB_CFLAGS) $(TK_CFLAGS) -c $<
+