Rename bloom_test_and_insert() to bloom_insert().

[adu.git] / Makefile

diff --git a/Makefile b/Makefile
index 751506b6fa72c2f683dc5a2cb66d470ef8c3679b..a0404789cd1bfebf98cecf7e47b05c57ab155072 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
-objects := adu.o string.o cmdline.o fd.o select.o create.o interactive.o select.cmdline.o format.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.3
+version := 0.0.5
+uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -13,13 +14,20 @@ CPPFLAGS += -Werror-implicit-function-declaration
 CPPFLAGS += -Wmissing-format-attribute
 CPPFLAGS += -Wunused-macros
 CPPFLAGS += -Wbad-function-cast
-CPPFLAGS += -D_LARGEFILE64_SOURCE
-CPPFLAGS += $(shell getconf LFS64_CFLAGS)
 CPPFLAGS += -DVERSION='"$(version)"'
+CPPFLAGS += -I/usr/local/include
 
-LDFLAGS += -D_LARGEFILE64_SOURCE
-LDFLAGS += $(shell getconf LFS64_LDFLAGS)
-LDFLAGS += $(shell getconf LFS64_LIBS)
+LDFLAGS += -L/usr/local/lib
+
+
+ifeq (,$(findstring BSD,$(uname_S)))
+       CPPFLAGS += -D_LARGEFILE64_SOURCE
+       CPPFLAGS += $(shell getconf LFS64_CFLAGS)
+       LDFLAGS += -D_LARGEFILE64_SOURCE
+       LDFLAGS += $(shell getconf LFS64_LDFLAGS)
+       LDFLAGS += $(shell getconf LFS64_LIBS)
+       CPPFLAGS += -DHAVE_STAT64=1
+endif
 
 
 Makefile.deps: $(wildcard *.c *.h)
@@ -40,6 +48,11 @@ cmdline.c cmdline.h: adu.ggo
 %.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 \
@@ -59,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
+       rm -f *.o adu *cmdline.c *cmdline.h adu.1 adu.1.html adu.png index.html adu.sk~
 
 index.html: adu.1.html index.html.in INSTALL README
        sed -e '/@README@/,$$d' index.html.in > $@