X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=Makefile;h=8adb38a2587caa28d71db200c8a7da1d7d850bc2;hp=1eb37aff313a1b5f0d9e49e6afe8aa115545af23;hb=5235e61583d358c177955c1da642e7c49e527acc;hpb=b471b45977f22e3a0628befda4ad84e07fac4391 diff --git a/Makefile b/Makefile index 1eb37af..8adb38a 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 @@ -14,7 +14,9 @@ CFLAGS += -Wformat-security CFLAGS += -Werror-implicit-function-declaration CFLAGS += -Wmissing-format-attribute CFLAGS += -Wunused-macros +CFLAGS += -Wunused-parameter CFLAGS += -Wbad-function-cast +CFLAGS += -Wshadow Makefile.deps: $(wildcard *.c *.h) gcc -MM -MG *.c > $@ @@ -30,10 +32,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 < $< @@ -42,18 +42,18 @@ dss.1: dss dss.1.inc help2man -h --detailed-help --include dss.1.inc -N ./$< > $@ %.1.html: %.1 - man2html $< > $@ + groff -m man -Thtml -P -l -P -r $< | sed -e '1,/^/d; /^<\/body>/,$$d' > $@ 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 >> $@ + cat dss.1.html >> $@ sed -e '1,/@MAN_PAGE@/d' index.html.in >> $@