build: Don't remove adu.png on make clean.

[adu.git] / Makefile

diff --git a/Makefile b/Makefile
index 1cb69566d3d8844275b29a0890ce8e08095b9b51..58202a224a6634ed39288ccf3b44f263ee715fb7 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
 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.1.0
+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
 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)
 
 
 Makefile.deps: $(wildcard *.c *.h)

-       $(CC) -MM -MG *.c > $@
+       $(CC) $(CPPFLAGS) -MM -MG *.c > $@

 
 -include Makefile.deps
 
 
 -include Makefile.deps
 


@@ -47,17 +47,12 @@ cmdline.o: cmdline.c cmdline.h
        $(CC) -c $(CPPFLAGS) $<
 
 cmdline.c cmdline.h: adu.ggo
        $(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) $<
 
 
 
 %.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 \
 select.cmdline.c select.cmdline.h: select.ggo
        gengetopt --set-package=select \
                --no-handle-help \


@@ -77,7 +72,7 @@ adu.1: adu adu.1.inc
        man2html $< | sed -e 's|^<DT><DD>$$|<DT><DD><br>|g' > $@
 
 clean:
        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 > $@
 
 index.html: adu.1.html index.html.in INSTALL README
        sed -e '/@README@/,$$d' index.html.in > $@