X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=Makefile;h=bbe616ac520024ca5c70c81998004b3c91fde38d;hp=f59e315752fd83e8949e0392e2c96e198b4d9a67;hb=d880112b1483b45f1e7db632cb09bbe05fb2df86;hpb=65e9747554779beed914d6a239c723dbef926678

diff --git a/Makefile b/Makefile
index f59e315..bbe616a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,20 @@
-dss_objects := cmdline.o dss.o string.o fd.o exec.o signal.o daemon.o df.o time.o snap.o
+dss_objects := cmdline.o dss.o str.o file.o exec.o sig.o daemon.o df.o tv.o snap.o ipc.o
 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 >> $@