Tweak conditionals for fdatasync hack

[openldap] / libraries / liblmdb / Makefile

diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile
index 8255d8b438b6919644eaeac73b3b64b927780304..2d0983eff04457c8f0e8d2cf785f23de46ca6606 100644 (file)
--- a/libraries/liblmdb/Makefile
+++ b/libraries/liblmdb/Makefile
@@ -5,32 +5,20 @@
 #
 # Preprocessor macros (for CPPFLAGS) of interest...
 # Note that the defaults should already be correct for most
-# platforms; you should not need to change any of these:
+# platforms; you should not need to change any of these.
+# Read their descriptions in mdb.c if you do:
 #
-# To compile successfully if the default does not:
-# - MDB_USE_POSIX_SEM  (enabled by default on BSD, Apple)
-#      Define if shared mutexes are unsupported.  Note that Posix
-#      semaphores and shared mutexes have different behaviors and
-#      different problems, see the Caveats section in lmdb.h.
-#
-# For best performance or to compile successfully:
-# - MDB_DSYNC = "O_DSYNC" (default) or "O_SYNC" (less efficient)
-#      If O_DSYNC is undefined but exists in /usr/include,
-#      preferably set some compiler flag to get the definition.
-# - MDB_FDATASYNC = "fdatasync" or "fsync"
-#      Function for flushing the data of a file. Define this to
-#      "fsync" if fdatasync() is not supported. fdatasync is
-#      default except on BSD, Apple, Android which use fsync.
+# - MDB_USE_POSIX_SEM
+# - MDB_DSYNC
+# - MDB_FDATASYNC
+# - MDB_FDATASYNC_WORKS
 # - MDB_USE_PWRITEV
-#      Define if the pwritev() function is supported.
 #
-# Data format:
-# - MDB_MAXKEYSIZE
-#      Controls data packing and limits, see mdb.c.
-#      You might need to change this if the default size is too small.
+# There may be other macros in mdb.c of interest. You should
+# read mdb.c before changing any of them.
 #
 CC     = gcc
-W      = -W -Wall -Wno-unused-parameter -Wbad-function-cast
+W      = -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
 THREADS = -pthread
 OPT = -O2 -g
 CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS)
@@ -42,32 +30,35 @@ prefix      = /usr/local
 
 IHDRS  = lmdb.h
 ILIBS  = liblmdb.a liblmdb.so
-IPROGS = mdb_stat mdb_copy
-IDOCS  = mdb_stat.1 mdb_copy.1
+IPROGS = mdb_stat mdb_copy mdb_dump mdb_load
+IDOCS  = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
 PROGS  = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
 all:   $(ILIBS) $(PROGS)
 
 install: $(ILIBS) $(IPROGS) $(IHDRS)
-       cp $(IPROGS) $(DESTDIR)$(prefix)/bin
-       cp $(ILIBS) $(DESTDIR)$(prefix)/lib
-       cp $(IHDRS) $(DESTDIR)$(prefix)/include
-       cp $(IDOCS) $(DESTDIR)$(prefix)/man/man1
+       for f in $(IPROGS); do cp $$f $(DESTDIR)$(prefix)/bin; done
+       for f in $(ILIBS); do cp $$f $(DESTDIR)$(prefix)/lib; done
+       for f in $(IHDRS); do cp $$f $(DESTDIR)$(prefix)/include; done
+       for f in $(IDOCS); do cp $$f $(DESTDIR)$(prefix)/man/man1; done
 
 clean:
-       rm -rf $(PROGS) *.[ao] *.so *~ testdb
+       rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
 
 test:  all
-       mkdir testdb
+       rm -rf testdb && mkdir testdb
        ./mtest && ./mdb_stat testdb
 
 liblmdb.a:     mdb.o midl.o
        ar rs $@ mdb.o midl.o
 
-liblmdb.so:    mdb.o midl.o
-       $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.o midl.o $(SOLIBS)
+liblmdb.so:    mdb.lo midl.lo
+#      $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
+       $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
 
 mdb_stat: mdb_stat.o liblmdb.a
 mdb_copy: mdb_copy.o liblmdb.a
+mdb_dump: mdb_dump.o liblmdb.a
+mdb_load: mdb_load.o liblmdb.a
 mtest:    mtest.o    liblmdb.a
 mtest2:        mtest2.o liblmdb.a
 mtest3:        mtest3.o liblmdb.a
@@ -76,13 +67,38 @@ mtest5:     mtest5.o liblmdb.a
 mtest6:        mtest6.o liblmdb.a
 
 mdb.o: mdb.c lmdb.h midl.h
-       $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c
+       $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
 
 midl.o: midl.c midl.h
-       $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c
+       $(CC) $(CFLAGS) $(CPPFLAGS) -c midl.c
+
+mdb.lo: mdb.c lmdb.h midl.h
+       $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c mdb.c -o $@
+
+midl.lo: midl.c midl.h
+       $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@
 
 %:     %.o
        $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 %.o:   %.c lmdb.h
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
+COV_FLAGS=-fprofile-arcs -ftest-coverage
+COV_OBJS=xmdb.o xmidl.o
+
+coverage: xmtest
+       for i in mtest*.c [0-9]*.c; do j=`basename \$$i .c`; $(MAKE) $$j.o; \
+               gcc -o x$$j $$j.o $(COV_OBJS) -pthread $(COV_FLAGS); \
+               rm -rf testdb; mkdir testdb; ./x$$j; done
+       gcov xmdb.c
+       gcov xmidl.c
+
+xmtest:        mtest.o xmdb.o xmidl.o
+       gcc -o xmtest mtest.o xmdb.o xmidl.o -pthread $(COV_FLAGS)
+
+xmdb.o: mdb.c lmdb.h midl.h
+       $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c mdb.c -o $@
+
+xmidl.o: midl.c midl.h
+       $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -O0 $(COV_FLAGS) -c midl.c -o $@