new API

and code cleanup

Makefile

@@ -7,13 +7,18 @@ MANDIR=$(DATADIR)/man
 
 CFLAGS=-g -Wall -Werror -Wextra -Wpedantic -Wno-unused-parameter $\
 	-Wno-overlength-strings -Wformat-security -Wformat -Wunused-result $\
+	-I protocol $\
 	$(shell pkg-config --cflags wayland-client) $\
 	$(shell guile-config compile)
 LIBS=-lrt $\
 	$(shell pkg-config --libs wayland-client) $\
 	$(shell guile-config link)
-OBJ=riverguile.o river-layout-v3.o
-GEN=river-layout-v3.c river-layout-v3.h
+OBJ=src/riverguile.o $\
+	src/call-layout-demand-handler.o $\
+	src/call-user-command-handler.o $\
+	src/load-script.o $\
+	protocol/river-layout-v3.o
+GEN=protocol/river-layout-v3.c protocol/river-layout-v3.h
 
 all: riverguile
 
@@ -31,7 +36,7 @@ $(OBJ): $(GEN)
 
 install: riverguile
 	install        -D riverguile         $(DESTDIR)$(BINDIR)/riverguile
-	install -m 644 -D riverguile.1       $(DESTDIR)$(MANDIR)/man1/riverguile.1
+	install -m 644 -D doc/riverguile.1   $(DESTDIR)$(MANDIR)/man1/riverguile.1
 
 uninstall:
 	$(RM) $(DESTDIR)$(BINDIR)/riverguile