From a088da1f8a544cdbc2de61538d96d4e43f6daef9 Mon Sep 17 00:00:00 2001
From: speedie <speedie@duck.com>
Date: Tue, 15 Nov 2022 18:34:32 +0100
Subject: [PATCH] update mk

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

diff --git a/Makefile b/Makefile
index 5428276..6787df0 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,12 @@ all: options st
 
 options:
 	@echo st build options:
-	@echo "CFLAGS  = $(STCFLAGS)"
-	@echo "LDFLAGS = $(STLDFLAGS)"
+	@echo "CFLAGS  = $(CFLAGS)"
+	@echo "LDFLAGS = $(LDFLAGS)"
 	@echo "CC      = $(CC)"
 
 .c.o:
-	$(CC) $(STCFLAGS) -c $<
+	$(CC) $(CFLAGS) -c $<
 
 st.o: options.h st.h win.h
 x.o: arg.h options.h st.h win.h
@@ -26,7 +26,7 @@ hb.o: st.h
 $(OBJ): options.mk
 
 st: $(OBJ)
-	$(CC) -o $@ $(OBJ) $(STLDFLAGS)
+	$(CC) -o $@ $(OBJ) $(LDFLAGS)
 
 clean:
 	rm -f st $(OBJ) st-$(VERSION).tar.gz
diff --git a/options.mk b/options.mk
index 0dd5921..42c02d3 100644
--- a/options.mk
+++ b/options.mk
@@ -28,9 +28,9 @@ CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Wno-unused-varia
 
 
 # flags
-STCPPFLAGS = -DVERSION=\"$(VERSION)\" -DICON=\"$(ICONPREFIX)/$(ICONNAME)\" -D_XOPEN_SOURCE=600
-STCFLAGS = $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-STLDFLAGS = $(LIBS) $(LDFLAGS)
+CPPFLAGS = -DVERSION=\"$(VERSION)\" -DICON=\"$(ICONPREFIX)/$(ICONNAME)\" -D_XOPEN_SOURCE=600
+LDFLAGS = $(LIBS) -g
+
 
 # OpenBSD:
 #CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE