build: Combine CFLAGS and DEBUG_CFLAGS.

[dss.git] / Makefile

diff --git a/Makefile b/Makefile
index c6780ef026ff86197073c007cf5100a78188cb68..7d3bd4262525b705feb82901532d9e74d9d97737 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,21 +10,19 @@ dss_objects := dss.o str.o file.o exec.o sig.o daemon.o df.o tv.o snap.o ipc.o d
 all: dss dss.1
 man: dss.1
 
-DEBUG_CFLAGS ?=
-DEBUG_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef
-DEBUG_CFLAGS += -Wredundant-decls
-CFLAGS ?=
-CFLAGS += -Os
-CFLAGS += -Wall
-CFLAGS += -Wuninitialized
-CFLAGS += -Wchar-subscripts
-CFLAGS += -Wformat-security
-CFLAGS += -Werror-implicit-function-declaration
-CFLAGS += -Wmissing-format-attribute
-CFLAGS += -Wunused-macros
-CFLAGS += -Wunused-parameter
-CFLAGS += -Wbad-function-cast
-CFLAGS += -Wshadow
+DSS_CFLAGS := -Wno-sign-compare -g -Wunused -Wundef
+DSS_CFLAGS += -Wredundant-decls
+DSS_CFLAGS += -Os
+DSS_CFLAGS += -Wall
+DSS_CFLAGS += -Wuninitialized
+DSS_CFLAGS += -Wchar-subscripts
+DSS_CFLAGS += -Wformat-security
+DSS_CFLAGS += -Werror-implicit-function-declaration
+DSS_CFLAGS += -Wmissing-format-attribute
+DSS_CFLAGS += -Wunused-macros
+DSS_CFLAGS += -Wunused-parameter
+DSS_CFLAGS += -Wbad-function-cast
+DSS_CFLAGS += -Wshadow
 
 Makefile.deps: $(wildcard *.c *.h)
        gcc -MM -MG *.c > $@
@@ -35,7 +33,7 @@ dss: $(dss_objects)
        $(CC) -o $@ $(dss_objects) $(LDFLAGS) -llopsub
 
 %.o: %.c Makefile
-       $(CC) -c -DVERSION_STRING='"$(VERSION_STRING)"' $(CFLAGS) $(DEBUG_CFLAGS) $<
+       $(CC) -c -DVERSION_STRING='"$(VERSION_STRING)"' $(DSS_CFLAGS) $(CFLAGS) $<
 
 %.png: %.dia
        dia -e $@ -t png $<