X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=Makefile;h=8e4d65388c3576aaf64a729cd6e710b2c9724156;hb=3af99704ff4b0830b49b06519cbd6b3579b9e863;hp=98716731500fd28e75fba59173efa43e1d7b6a69;hpb=5bb143ffcff41d4a9a21669aea0f37fa3e144e43;p=adu.git

diff --git a/Makefile b/Makefile
index 9871673..8e4d653 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 objects := adu.o string.o cmdline.o fd.o select.o create.o interactive.o select.cmdline.o format.o user.o bloom.o
 all: adu
-version := 0.0.5
+version := 1.0.0
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
@@ -36,7 +36,7 @@ endif
 
 
 Makefile.deps: $(wildcard *.c *.h)
-	$(CC) -MM -MG *.c > $@
+	$(CC) $(CPPFLAGS) -MM -MG *.c > $@
 
 -include Makefile.deps
 
@@ -47,17 +47,12 @@ cmdline.o: cmdline.c cmdline.h
 	$(CC) -c $(CPPFLAGS) $<
 
 cmdline.c cmdline.h: adu.ggo
-	gengetopt --no-handle-error --no-handle-help --conf-parser < $<
+	gengetopt --no-handle-error --no-handle-help < $<
 
 
 %.o: %.c Makefile
 	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
 
-%.ppm: %.sk
-	sk2ppm $< > $@
-%.png: %.ppm
-	convert $< $@
-
 select.cmdline.c select.cmdline.h: select.ggo
 	gengetopt --set-package=select \
 		--no-handle-help \
@@ -77,13 +72,13 @@ adu.1: adu adu.1.inc
 	man2html $< | sed -e 's|^<DT><DD>$$|<DT><DD><br>|g' > $@
 
 clean:
-	rm -f *.o adu *cmdline.c *cmdline.h adu.1 adu.1.html adu.png index.html adu.sk~
+	rm -f *.o adu *cmdline.c *cmdline.h adu.1 adu.1.html index.html
 
 index.html: adu.1.html index.html.in INSTALL README
 	sed -e '/@README@/,$$d' index.html.in > $@
-	grutatxt -nb < README >> $@
+	markdown README >> $@
 	sed -e '1,/@README@/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' adu.1.html >> $@
 	sed -e '1,/@MAN_PAGE@/d' index.html.in >> $@