Merge branch 'refs/heads/t/doc-improvements'

[adu.git] / Makefile

diff --git a/Makefile b/Makefile
index 28fb2d4b753846fde5b3b243495b98f3b041c22a..8e4d65388c3576aaf64a729cd6e710b2c9724156 100644 (file)
--- 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
@@ -20,6 +20,9 @@ CPPFLAGS += -I/usr/local/include
 LDFLAGS += -L/usr/local/lib
 
 PREFIX ?= /usr/local
+ifeq "$(origin CC)" "default"
+       CC := gcc
+endif
 
 
 ifeq (,$(findstring BSD,$(uname_S)))
@@ -33,28 +36,23 @@ endif
 
 
 Makefile.deps: $(wildcard *.c *.h)
-       gcc -MM -MG *.c > $@
+       $(CC) $(CPPFLAGS) -MM -MG *.c > $@
 
 -include Makefile.deps
 
 adu: $(objects)
-       $(CC) -o $@ $(LDFLAGS) $(objects) -lcrypto -losl
+       $(CC) -o $@ $(LDFLAGS) $(objects) -losl
 
 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 \
@@ -74,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 >> $@