commit 1f352fb58c4220e2129aaff835527ab41313ed32 parent d573a1cad38a59b6b0aa28412929b03f3f531517 Author: Janne Veteläinen <janne.vetelainen@elisanet.fi> Date: Sun, 7 Jul 2024 23:40:26 +0300 Allow environment to set CFLAGS/LDFLAGS Diffstat:
| M | Makefile | | | 2 | +- |
| M | systray/Makefile | | | 18 | +++++++++++------- |
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile @@ -55,7 +55,7 @@ dwlb: CFLAGS+=$(shell pkg-config --cflags wayland-client wayland-cursor fcft pix dwlb: LDLIBS+=$(shell pkg-config --libs wayland-client wayland-cursor fcft pixman-1) -lrt systray: - $(MAKE) -C systray + $(MAKE) -e -C systray .PHONY: all systray clean install diff --git a/systray/Makefile b/systray/Makefile @@ -1,10 +1,15 @@ +.SUFFIXES: + PROGNAME = dwlbtray CC = cc RM = rm -f PREFIX = /usr/local -CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -g -DEPINCLUDES = `pkg-config --cflags glib-2.0 gtk4 gtk4-layer-shell-0` -DEPLIBS = `pkg-config --libs glib-2.0 gtk4 gtk4-layer-shell-0` +CFLAGS = -Wall -Wextra -g +SUPPRESS = -Wno-missing-field-initializers -Wno-unused-parameter +DEPINCLUDES = `pkg-config --cflags glib-2.0 gobject-2.0 gio-2.0 gdk-pixbuf-2.0 \ + gtk4 gtk4-layer-shell-0` +DEPLIBS = `pkg-config --libs glib-2.0 gobject-2.0 gio-2.0 gdk-pixbuf-2.0 \ + gtk4 gtk4-layer-shell-0` OBJS = dwlbtray.o snwatcher.o snhost.o snitem.o sndbusmenu.o all: $(PROGNAME) @@ -15,13 +20,12 @@ clean: install: all install -D -t $(PREFIX)/bin $(PROGNAME) -dwlbtray: dwlbtray.o snwatcher.o snhost.o snitem.o sndbusmenu.o - $(CC) $(LDFLAGS) -o $(PROGNAME) $(OBJS) $(DEPLIBS) +dwlbtray: $(OBJS) + $(CC) $(DEPLIBS) -o $(PROGNAME) $(LDFLAGS) $? -.SUFFIXES: .SUFFIXES: .c .o .c.o: - $(CC) $(CFLAGS) $(DEPINCLUDES) -c $< + $(CC) -c $(DEPINCLUDES) $(CFLAGS) $(SUPPRESS) $< dwlbtray.o: dwlbtray.c snhost.h snwatcher.o: snwatcher.c snwatcher.h