--- a/GNUmakefile 2022-12-16 01:15:13.000000000 +0100 +++ b/GNUmakefile 2023-11-24 22:12:14.440211883 +0100 @@ -24,12 +24,11 @@ pkgconfigs = bemenu.pc bins = bemenu bemenu-run mans = bemenu.1 -renderers = bemenu-renderer-x11.so bemenu-renderer-curses.so bemenu-renderer-wayland.so +renderers = bemenu-renderer-x11.so bemenu-renderer-curses.so all: $(bins) $(renderers) $(mans) clients: $(bins) curses: bemenu-renderer-curses.so x11: bemenu-renderer-x11.so -wayland: bemenu-renderer-wayland.so # support non git builds .git/index: @@ -75,33 +74,9 @@ bemenu-renderer-x11.so: private override CPPFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I x11 xinerama cairo pango pangocairo) bemenu-renderer-x11.so: lib/renderers/cairo_renderer.h lib/renderers/x11/x11.c lib/renderers/x11/x11.h lib/renderers/x11/window.c lib/renderers/x11/xkb_unicode.c lib/renderers/x11/xkb_unicode.h util.a -lib/renderers/wayland/xdg-shell.c: - wayland-scanner private-code < "$$($(PKG_CONFIG) --variable=pkgdatadir wayland-protocols)/stable/xdg-shell/xdg-shell.xml" > $@ - -lib/renderers/wayland/wlr-layer-shell-unstable-v1.h: lib/renderers/wayland/wlr-layer-shell-unstable-v1.xml - wayland-scanner client-header < $^ > $@ - -lib/renderers/wayland/wlr-layer-shell-unstable-v1.c: lib/renderers/wayland/wlr-layer-shell-unstable-v1.xml - wayland-scanner private-code < $^ > $@ - -lib/renderers/wayland/xdg-output-unstable-v1.h: lib/renderers/wayland/xdg-output-unstable-v1.xml - wayland-scanner client-header < $^ > $@ - -lib/renderers/wayland/xdg-output-unstable-v1.c: lib/renderers/wayland/xdg-output-unstable-v1.xml - wayland-scanner private-code < $^ > $@ - xdg-shell.a: private override LDFLAGS += -fPIC -xdg-shell.a: private override CPPFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I wayland-client) -xdg-shell.a: lib/renderers/wayland/xdg-shell.c wlr-layer-shell.a: private override LDFLAGS += -fPIC -wlr-layer-shell.a: private override CPPFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I wayland-client) -wlr-layer-shell.a: lib/renderers/wayland/wlr-layer-shell-unstable-v1.c lib/renderers/wayland/wlr-layer-shell-unstable-v1.h xdg-output.a: private override LDFLAGS += -fPIC -xdg-output.a: private override CPPFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I wayland-client) -xdg-output.a: lib/renderers/wayland/xdg-output-unstable-v1.c lib/renderers/wayland/xdg-output-unstable-v1.h -bemenu-renderer-wayland.so: private override LDLIBS += $(shell $(PKG_CONFIG) --libs wayland-client cairo pango pangocairo xkbcommon) -bemenu-renderer-wayland.so: private override CPPFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I wayland-client cairo pango pangocairo xkbcommon) -bemenu-renderer-wayland.so: lib/renderers/cairo_renderer.h lib/renderers/wayland/wayland.c lib/renderers/wayland/wayland.h lib/renderers/wayland/registry.c lib/renderers/wayland/window.c xdg-shell.a wlr-layer-shell.a xdg-output.a util.a common.a: client/common/common.c client/common/common.h bemenu: common.a client/bemenu.c @@ -131,16 +106,12 @@ -hash scdoc && mkdir -p "$(DESTDIR)$(PREFIX)$(mandir)" -hash scdoc && cp $< "$(DESTDIR)$(PREFIX)$(mandir)" -install-renderers: install-curses install-wayland install-x11 +install-renderers: install-curses install-x11 install-curses: mkdir -p "$(DESTDIR)$(PREFIX)$(libdir)/bemenu" -cp bemenu-renderer-curses.so "$(DESTDIR)$(PREFIX)$(libdir)/bemenu" -install-wayland: - mkdir -p "$(DESTDIR)$(PREFIX)$(libdir)/bemenu" - -cp bemenu-renderer-wayland.so "$(DESTDIR)$(PREFIX)$(libdir)/bemenu" - install-x11: mkdir -p "$(DESTDIR)$(PREFIX)$(libdir)/bemenu" -cp bemenu-renderer-x11.so "$(DESTDIR)$(PREFIX)$(libdir)/bemenu" @@ -168,7 +139,6 @@ clean: $(RM) -r *.dSYM # OSX generates .dSYM dirs with -g ... $(RM) $(pkgconfigs) $(libs) $(bins) $(renderers) $(mans) *.a *.so.* - $(RM) lib/renderers/wayland/wlr-*.h lib/renderers/wayland/wlr-*.c lib/renderers/wayland/xdg-shell.c $(RM) -r html uninstall: @@ -181,5 +151,5 @@ .DELETE_ON_ERROR: .PHONY: all clean uninstall install install-base install-pkgconfig install-include install-libs install-lib-symlinks \ - install-man install-bins install-docs install-renderers install-curses install-wayland install-x11 \ - doxygen sign check-symbols clients curses x11 wayland + install-man install-bins install-docs install-renderers install-curses install-x11 \ + doxygen sign check-symbols clients curses x11