commit d7125da

mk: misc. fixes

 1@@ -12,7 +12,7 @@ INCS != $(PKG_CONFIG) --cflags $(PKGS)
 2 LIBS != $(PKG_CONFIG) --libs $(PKGS)
 3 
 4 CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
 5-CFLAGS   = -pedantic -Wall $(INCS)
 6+CFLAGS   = -pedantic -Wall $(CPPFLAGS) $(INCS)
 7 LDLIBS   = $(LIBS)
 8 
 9 all: wawa
10@@ -27,21 +27,18 @@ WAYLAND_PROTOCOLS != $(PKG_CONFIG) --variable=pkgdatadir wayland-protocols
11 WAYLAND_SCANNER   != $(PKG_CONFIG) --variable=wayland_scanner wayland-scanner
12 
13 # I absolutely despise this. Cannot avoid it without using BSD or GNU make.
14-xdg-shell-protocol.c xdg-shell-protocol.h: $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml
15 xdg-shell-protocol.h:
16-	$(WAYLAND_SCANNER) client-header $< $@
17+	$(WAYLAND_SCANNER) client-header $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
18 xdg-shell-protocol.c:
19-	$(WAYLAND_SCANNER) private-code $< $@
20-viewporter-protocol.c viewporter-protocol.h: $(WAYLAND_PROTOCOLS)/stable/viewporter/viewporter.xml
21+	$(WAYLAND_SCANNER) private-code $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
22 viewporter-protocol.h:
23-	$(WAYLAND_SCANNER) client-header $< $@
24+	$(WAYLAND_SCANNER) client-header $(WAYLAND_PROTOCOLS)/stable/viewporter/viewporter.xml $@
25 viewporter-protocol.c:
26-	$(WAYLAND_SCANNER) private-code $< $@
27-wlr-layer-shell-unstable-v1-protocol.c wlr-layer-shell-unstable-v1-protocol.h: wlr-layer-shell-unstable-v1.xml
28+	$(WAYLAND_SCANNER) private-code $(WAYLAND_PROTOCOLS)/stable/viewporter/viewporter.xml $@
29 wlr-layer-shell-unstable-v1-protocol.h:
30-	$(WAYLAND_SCANNER) client-header $< $@
31+	$(WAYLAND_SCANNER) client-header wlr-layer-shell-unstable-v1.xml $@
32 wlr-layer-shell-unstable-v1-protocol.c:
33-	$(WAYLAND_SCANNER) private-code $< $@
34+	$(WAYLAND_SCANNER) private-code wlr-layer-shell-unstable-v1.xml $@
35 	
36 clean:
37 	rm -f wawa $(OBJ) $(PROTO) $(PROTO:.h=.c)

1@@ -93,7 +93,7 @@ static struct wl_callback_listener image_cleanup_callback_listener = {
2 };
3 
4 static void
5-load_image()
6+load_image(void)
7 {
8 	int fd;
9 	struct wl_shm_pool *shm_pool;