Convert INSTALL and NEWS to markdown format.

[dss.git] / Makefile

diff --git a/Makefile b/Makefile
index 1eb37aff313a1b5f0d9e49e6afe8aa115545af23..111019c53d3f5dc21ed06f40f787bdf4caa20bc8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-dss_objects := cmdline.o dss.o string.o fd.o exec.o signal.o daemon.o df.o time.o snap.o ipc.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_CFLAGS ?=
-DEBUG_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
+DEBUG_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef
 DEBUG_CFLAGS += -Wredundant-decls
 CFLAGS ?=
 CFLAGS += -Os
@@ -30,10 +30,8 @@ cmdline.o: cmdline.c cmdline.h
 %.o: %.c Makefile
        $(CC) -c $(CFLAGS) $(DEBUG_CFLAGS) $<
 
-%.ppm: %.sk
-       sk2ppm $< > $@
-%.png: %.ppm
-       convert $< $@
+%.png: %.dia
+       dia -e $@ -t png $<
 
 cmdline.c cmdline.h: dss.ggo
        gengetopt --conf-parser < $<
@@ -45,15 +43,15 @@ dss.1: dss dss.1.inc
        man2html $< > $@
 
 clean:
-       rm -f *.o dss dss.1 dss.1.html Makefile.deps *.ppm *.png *~ cmdline.c cmdline.h index.html
+       rm -f *.o dss dss.1 dss.1.html Makefile.deps *.png *~ cmdline.c cmdline.h index.html
 
 index.html: dss.1.html index.html.in INSTALL README NEWS
        sed -e '/@README@/,$$d' index.html.in > $@
-       grutatxt -nb < README >> $@
+       markdown README >> $@
        sed -e '1,/@README@/d' -e '/@NEWS@/,$$d' index.html.in >> $@
-       grutatxt -nb < NEWS >> $@
+       markdown NEWS >> $@
        sed -e '1,/@NEWS@/d' -e '/@INSTALL@/,$$d' index.html.in >> $@
-       grutatxt -nb < INSTALL >> $@
+       markdown 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 >> $@
+       sed -e '1,/Return to Main Contents/d' -e '/SEE ALSO/,$$d' dss.1.html >> $@
        sed -e '1,/@MAN_PAGE@/d' index.html.in >> $@