X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=Makefile;h=00ef9e84c27d9eaec5312792fee98ccbe8be32d1;hp=78c9b1697b647cb6a56c9814ea2a94d8b86b8bdd;hb=6744ce67f91c410f69de0763fb6faa01a8a53b28;hpb=59af25aafd51b706ed67784aa84332965c31bb26

diff --git a/Makefile b/Makefile
index 78c9b16..00ef9e8 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
@@ -19,7 +19,7 @@ CPPFLAGS += -I/usr/local/include
 
 LDFLAGS += -L/usr/local/lib
 
-PREFIX ?:= /usr/local
+PREFIX ?= /usr/local
 ifeq "$(origin CC)" "default"
 	CC := gcc
 endif
@@ -36,28 +36,23 @@ endif
 
 
 Makefile.deps: $(wildcard *.c *.h)
-	$(CC) -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 \