From f16a3c11806d0a52c99b7c843334b89330b84c73 Mon Sep 17 00:00:00 2001
From: BiRD <1094438-BiRD04@users.noreply.gitlab.freedesktop.org>
Date: Wed, 10 Jul 2024 11:54:27 -0400
Subject: [PATCH] tinywl: Edit Makefile for bmake compatibility

- Replace 'shell' calls with '!=' assignments
- Add default target 'all'
- Don't use var '$<' for non-sources
---
 tinywl/Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/tinywl/Makefile b/tinywl/Makefile
index 64e7af47..a5cedfcc 100644
--- a/tinywl/Makefile
+++ b/tinywl/Makefile
@@ -1,10 +1,13 @@
 PKG_CONFIG?=pkg-config
-WAYLAND_PROTOCOLS=$(shell $(PKG_CONFIG) --variable=pkgdatadir wayland-protocols)
-WAYLAND_SCANNER=$(shell $(PKG_CONFIG) --variable=wayland_scanner wayland-scanner)
+WAYLAND_PROTOCOLS!=$(PKG_CONFIG) --variable=pkgdatadir wayland-protocols
+WAYLAND_SCANNER!=$(PKG_CONFIG) --variable=wayland_scanner wayland-scanner
 
 PKGS="wlroots-0.19" wayland-server xkbcommon
-CFLAGS+=$(shell $(PKG_CONFIG) --cflags $(PKGS))
-LIBS=$(shell $(PKG_CONFIG) --libs $(PKGS))
+CFLAGS_PKG_CONFIG!=$(PKG_CONFIG) --cflags $(PKGS)
+CFLAGS+=$(CFLAGS_PKG_CONFIG)
+LIBS!=$(PKG_CONFIG) --libs $(PKGS)
+
+all: tinywl
 
 # wayland-scanner is a tool which generates C headers and rigging for Wayland
 # protocols, which are specified in XML. wlroots requires you to rig these up
@@ -14,12 +17,11 @@ xdg-shell-protocol.h:
 		$(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@
 
 tinywl.o: tinywl.c xdg-shell-protocol.h
-	$(CC) -g -Werror $(CFLAGS) -I. -DWLR_USE_UNSTABLE -o $@ -c $<
+	$(CC) -c $< -g -Werror $(CFLAGS) -I. -DWLR_USE_UNSTABLE -o $@
 tinywl: tinywl.o
-	$(CC) $< -g -Werror $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $^ $> -g -Werror $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@
 
 clean:
 	rm -f tinywl tinywl.o xdg-shell-protocol.h
 
-.DEFAULT_GOAL=tinywl
-.PHONY: clean
+.PHONY: all clean