X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=58202a224a6634ed39288ccf3b44f263ee715fb7;hb=1e5a1cb342d8cba5c55a720eaca1f095d516ba51;hp=9a0ffb755466804413212d109757897c6e6724c1;hpb=c1bef07ef61d3266e7ab1f1e738d9c29c3516f89;p=adu.git

diff --git a/Makefile b/Makefile
index 9a0ffb7..58202a2 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
@@ -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)
-	$(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 \
@@ -74,7 +72,7 @@ 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 > $@