spkp

Stacking wayland compositor
git clone git://git.z3bra.org/sp:kp.git
Log | Files | Refs

commit 813ab37ef9e0a2606ec13c78c3abac5f5655fb56
parent bdb94039d9d277179778aa36b086ce8c9d4f90f7
Author: Willy Goiffon <dev@z3bra.org>
Date:   Tue, 10 Nov 2020 17:53:08 +0100

Remove unnecessary header files

Diffstat:
Mcompositor.c | 3---
Mconfig.mk | 2+-
Mmakefile | 13+++++--------
Mmkfile | 17++++-------------
4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/compositor.c b/compositor.c @@ -24,9 +24,6 @@ #include <linux/input-event-codes.h> -#include "xdg-shell-protocol.h" -#include "xdg-decoration-unstable-v1-protocol.h" - #include "arg.h" enum { diff --git a/config.mk b/config.mk @@ -7,6 +7,6 @@ MANDIR = ${PREFIX}/share/man CPPFLAGS = -DWLR_USE_UNSTABLE CFLAGS = -Wall -Wextra -pedantic -g LDFLAGS = -WL_CFLAGS = -I./proto -I/usr/include/libdrm -I/usr/include/pixman-1 +WL_CFLAGS = -I. -I/usr/include/libdrm -I/usr/include/pixman-1 WL_LIBS = -lwlroots -lwayland-server -lpixman-1 -lxkbcommon WL_PROTO = /usr/lib/wayland-protocols diff --git a/makefile b/makefile @@ -2,24 +2,21 @@ all: compositor -compositor: compositor.o proto/xdg-shell-protocol.o - $(LD) $(LDFLAGS) compositor.o proto/xdg-shell-protocol.o $(WL_LIBS) -o $@ +compositor: compositor.o + $(LD) $(LDFLAGS) compositor.o $(WL_LIBS) -o $@ -compositor.o: config.h proto/xdg-shell-protocol.h +compositor.o: config.h xdg-shell-protocol.h .c.o: $(CC) $(CPPFLAGS) $(CFLAGS) $(WL_CFLAGS) -c $< -o $@ config.h: config.def.h cp config.def.h $@ -proto/xdg-shell-protocol.c: $(WL_PROTO)/stable/xdg-shell/xdg-shell.xml - wayland-scanner public-code < $(WL_PROTO)/stable/xdg-shell/xdg-shell.xml > $@ - -proto/xdg-shell-protocol.h: $(WL_PROTO)/stable/xdg-shell/xdg-shell.xml +xdg-shell-protocol.h: $(WL_PROTO)/stable/xdg-shell/xdg-shell.xml wayland-scanner server-header < $(WL_PROTO)/stable/xdg-shell/xdg-shell.xml > $@ clean: - rm -f compositor *.o proto/* + rm -f compositor *.o install: compositor mkdir -p $(DESTDIR)$(PREFIX)/bin diff --git a/mkfile b/mkfile @@ -2,30 +2,21 @@ all:V: compositor -compositor: compositor.o proto/xdg-shell-protocol.o proto/xdg-decoration-unstable-v1-protocol.o +compositor: compositor.o ${LD} ${LDFLAGS} $prereq ${WL_LIBS} -o $target -compositor.o: config.h proto/xdg-shell-protocol.h proto/xdg-decoration-unstable-v1-protocol.h +compositor.o: config.h xdg-shell-protocol.h %.o: %.c ${CC} ${CPPFLAGS} ${CFLAGS} ${WL_CFLAGS} -c $stem.c -o $stem.o config.h: config.def.h cp $prereq $target -proto/xdg-shell-protocol.c: ${WL_PROTO}/stable/xdg-shell/xdg-shell.xml - wayland-scanner public-code < $prereq > $target - -proto/xdg-shell-protocol.h: ${WL_PROTO}/stable/xdg-shell/xdg-shell.xml - wayland-scanner server-header < $prereq > $target - -proto/xdg-decoration-unstable-v1-protocol.c: ${WL_PROTO}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml - wayland-scanner public-code < $prereq > $target - -proto/xdg-decoration-unstable-v1-protocol.h: ${WL_PROTO}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml +xdg-shell-protocol.h: ${WL_PROTO}/stable/xdg-shell/xdg-shell.xml wayland-scanner server-header < $prereq > $target clean:V: - rm -f compositor *.o proto/* + rm -f compositor *.o install:V: compositor mkdir -p ${DESTDIR}${PREFIX}/bin