X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=Makefile;h=7a4b6a98c9c5b3af9efdbfa5f2bf6040e0b7e3f5;hp=1eb37aff313a1b5f0d9e49e6afe8aa115545af23;hb=bc13db9debf825347d397c292e075cbe3f804ac0;hpb=42451d3bbe741ebae3c8ad49aa104ae53efdbcdb

diff --git a/Makefile b/Makefile
index 1eb37af..7a4b6a9 100644
--- 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,7 +43,7 @@ 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 > $@
@@ -55,5 +53,5 @@ index.html: dss.1.html index.html.in INSTALL README 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 >> $@
+	sed -e '1,/Return to Main Contents/d' -e '/SEE ALSO/,$$d' dss.1.html >> $@
 	sed -e '1,/@MAN_PAGE@/d' index.html.in >> $@