Fix "comma after last element" warning.

[dss.git] / Makefile

diff --git a/Makefile b/Makefile
index f59e315752fd83e8949e0392e2c96e198b4d9a67..c4ff4601c8b38e70ae7a400f012e99ddc4ce6752 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,17 +2,19 @@ dss_objects := cmdline.o dss.o string.o fd.o exec.o signal.o daemon.o df.o time.
 all: dss
 man: dss.1
 
-DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
-DEBUG_CPPFLAGS += -Wredundant-decls
-CPPFLAGS += -Os
-CPPFLAGS += -Wall
-CPPFLAGS += -Wuninitialized
-CPPFLAGS += -Wchar-subscripts
-CPPFLAGS += -Wformat-security
-CPPFLAGS += -Werror-implicit-function-declaration
-CPPFLAGS += -Wmissing-format-attribute
-CPPFLAGS += -Wunused-macros
-CPPFLAGS += -Wbad-function-cast
+DEBUG_CFLAGS ?=
+DEBUG_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
+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 += -Wbad-function-cast
 
 Makefile.deps: $(wildcard *.c *.h)
        gcc -MM -MG *.c > $@
@@ -23,10 +25,10 @@ dss: $(dss_objects)
        $(CC) -o $@ $(dss_objects)
 
 cmdline.o: cmdline.c cmdline.h
-       $(CC) -c $(CPPFLAGS) $<
+       $(CC) -c $(CFLAGS) $<
 
 %.o: %.c Makefile
-       $(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+       $(CC) -c $(CFLAGS) $(DEBUG_CFLAGS) $<
 
 %.ppm: %.sk
        sk2ppm $< > $@
@@ -45,10 +47,12 @@ dss.1: dss dss.1.inc
 clean:
        rm -f *.o dss dss.1 dss.1.html Makefile.deps *.ppm *.png *~ cmdline.c cmdline.h index.html
 
-index.html: dss.1.html index.html.in INSTALL README
+index.html: dss.1.html index.html.in INSTALL README NEWS
        sed -e '/@README@/,$$d' index.html.in > $@
        grutatxt -nb < README >> $@
-       sed -e '1,/@README@/d' -e '/@INSTALL@/,$$d' index.html.in >> $@
+       sed -e '1,/@README@/d' -e '/@NEWS@/,$$d' index.html.in >> $@
+       grutatxt -nb < NEWS >> $@
+       sed -e '1,/@NEWS@/d' -e '/@INSTALL@/,$$d' index.html.in >> $@
        grutatxt -nb < INSTALL >> $@
        sed -e '1,/@INSTALL@/d' -e '/@MAN_PAGE@/,$$d' index.html.in >> $@
        sed -e '1,/Return to Main Contents/d' -e '/Index/,$$d' dss.1.html >> $@