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

diff --git a/Makefile b/Makefile
index a6214b0..7a4b6a9 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
+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
+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 > $@
@@ -20,26 +22,36 @@ Makefile.deps: $(wildcard *.c *.h)
 -include Makefile.deps
 
 dss: $(dss_objects)
-	$(CC) $(CPPFLAGS) $(DEBUG_CPPFLAGS) -o $@ $(dss_objects)
+	$(CC) -o $@ $(dss_objects)
 
-%.o: %.c cmdline.h
-	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
+cmdline.o: cmdline.c cmdline.h
+	$(CC) -c $(CFLAGS) $<
 
-%.ppm: %.sk
-	sk2ppm $< > $@
-%.png: %.ppm
-	convert $< $@
+%.o: %.c Makefile
+	$(CC) -c $(CFLAGS) $(DEBUG_CFLAGS) $<
+
+%.png: %.dia
+	dia -e $@ -t png $<
 
 cmdline.c cmdline.h: dss.ggo
 	gengetopt --conf-parser < $<
 
-dss.1: dss
-	help2man -N ./$< > $@
+dss.1: dss dss.1.inc
+	help2man -h --detailed-help --include dss.1.inc -N ./$< > $@
 
 %.1.html: %.1
 	man2html $< > $@
 
 clean:
-	rm -f *.o dss dss.1 dss.1.html Makefile.deps *.ppm *.png *~ cmdline.c cmdline.h
-
-
+	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 >> $@
+	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 '/SEE ALSO/,$$d' dss.1.html >> $@
+	sed -e '1,/@MAN_PAGE@/d' index.html.in >> $@