From ca390636edb05ce3820f26d63f5535095bd5cb13 Mon Sep 17 00:00:00 2001
From: hazen2215 <haz@disroot.org>
Date: Sat, 17 Jun 2023 18:37:21 +0900
Subject: [PATCH] Makefile, config.mk: respect user {C,CPP,LD}FLAGS

---
 Makefile  | 10 +++++-----
 config.mk |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a03a95c..f59a238 100644
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,12 @@ all: options dmenu stest
 
 options:
 	@echo dmenu build options:
-	@echo "CFLAGS   = $(CFLAGS)"
-	@echo "LDFLAGS  = $(LDFLAGS)"
+	@echo "CFLAGS   = $(XCFLAGS)"
+	@echo "LDFLAGS  = $(XLDFLAGS)"
 	@echo "CC       = $(CC)"
 
 .c.o:
-	$(CC) -c $(CFLAGS) $<
+	$(CC) -c $(XCFLAGS) $<
 
 config.h:
 	cp config.def.h $@
@@ -23,10 +23,10 @@ config.h:
 $(OBJ): arg.h config.h config.mk drw.h
 
 dmenu: dmenu.o drw.o util.o
-	$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
+	$(CC) -o $@ dmenu.o drw.o util.o $(XLDFLAGS)
 
 stest: stest.o
-	$(CC) -o $@ stest.o $(LDFLAGS)
+	$(CC) -o $@ stest.o $(XLDFLAGS)
 
 clean:
 	rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
diff --git a/config.mk b/config.mk
index 566348b..7e274ce 100644
--- a/config.mk
+++ b/config.mk
@@ -24,9 +24,9 @@ INCS = -I$(X11INC) -I$(FREETYPEINC)
 LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
 
 # flags
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
-LDFLAGS  = $(LIBS)
+XCPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+XCFLAGS   = -std=c99 -pedantic -Wall $(INCS) $(XCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
+XLDFLAGS  = $(LIBS) $(LDFLAGS)
 
 # compiler and linker
 CC = cc