Simplify and rename mmap_full_file().

[adu.git] / Makefile

diff --git a/Makefile b/Makefile
index 880ba86952ca108d95de2b65b7be38d1263ed8b0..ed5db6daef5807d74d295127a7fa401ad2bee5e1 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
+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 := 0.1.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 \