commit d916cac
shrub
·
2026-01-30 20:40:12 +0000 UTC
parent 5a4a636
more makefile changes
2 files changed,
+20,
-13
M
Makefile
+17,
-4
1@@ -89,13 +89,19 @@ PROTO_EXTENSIONS= \
2
3 .for xml in ${PROTO_EXTENSIONS}
4 _base=${xml:T:R}
5-protocol/${_base}-protocol.c: ${xml}
6+protocol/${_base}-protocol.c: ${xml} \
7+ protocol/${_base}-server-protocol.h \
8+ protocol/${_base}-client-protocol.h
9 @echo " GEN $@"
10- @${WAYLAND_SCANNER} code < ${.ALLSRC} > ${.TARGET}
11+ @${WAYLAND_SCANNER} code ${xml} ${.TARGET}
12
13 protocol/${_base}-server-protocol.h: ${xml}
14 @echo " GEN $@"
15- @${WAYLAND_SCANNER} server-header < ${.ALLSRC} > ${.TARGET}
16+ @${WAYLAND_SCANNER} server-header ${xml} ${.TARGET}
17+
18+protocol/${_base}-client-protocol.h: ${xml}
19+ @echo " GEN $@"
20+ @${WAYLAND_SCANNER} client-header ${xml} ${.TARGET}
21 .endfor
22
23 PROTO_GEN_C= \
24@@ -109,12 +115,19 @@ PROTO_GEN_C= \
25
26 PROTO_GEN_H= \
27 protocol/linux-dmabuf-unstable-v1-server-protocol.h \
28+ protocol/linux-dmabuf-unstable-v1-client-protocol.h \
29 protocol/server-decoration-server-protocol.h \
30+ protocol/server-decoration-client-protocol.h \
31 protocol/swc-server-protocol.h \
32+ protocol/swc-client-protocol.h \
33 protocol/swc_snap-server-protocol.h \
34+ protocol/swc_snap-client-protocol.h \
35 protocol/wayland-drm-server-protocol.h \
36+ protocol/wayland-drm-client-protocol.h \
37 protocol/xdg-decoration-unstable-v1-server-protocol.h \
38- protocol/xdg-shell-server-protocol.h
39+ protocol/xdg-decoration-unstable-v1-client-protocol.h \
40+ protocol/xdg-shell-server-protocol.h \
41+ protocol/xdg-shell-client-protocol.h
42
43 cursor/cursor_data.h: cursor/cursor.pcf cursor/convert_font
44 @echo " GEN $@"
+3,
-9
1@@ -17,17 +17,11 @@ $(dir)_PACKAGES := wayland-server
2 .for ext in ${PROTOCOL_EXTENSIONS}
3 proto_base := ${ext:T:R}
4
5-${dir}/${proto_base}-protocol.c: ${ext} \
6- ${dir}/${proto_base}-server-protocol.h \
7- ${dir}/${proto_base}-client-protocol.h
8+${dir}/${proto_base}-protocol.c: ${ext}
9+ ${Q_GEN}${WAYLAND_SCANNER} server-header ${ext} ${dir}/${proto_base}-server-protocol.h
10+ ${Q_GEN}${WAYLAND_SCANNER} client-header ${ext} ${dir}/${proto_base}-client-protocol.h
11 ${Q_GEN}${WAYLAND_SCANNER} code ${ext} ${.TARGET}
12
13-${dir}/${proto_base}-server-protocol.h: ${ext}
14- ${Q_GEN}${WAYLAND_SCANNER} server-header ${ext} ${.TARGET}
15-
16-${dir}/${proto_base}-client-protocol.h: ${ext}
17- ${Q_GEN}${WAYLAND_SCANNER} client-header ${ext} ${.TARGET}
18-
19 CLEAN_FILES += ${dir}/${proto_base}-protocol.c \
20 ${dir}/${proto_base}-server-protocol.h \
21 ${dir}/${proto_base}-client-protocol.h