Commit 0cdf70b4 authored by Philip Carns's avatar Philip Carns
Browse files

finish converting abt-io to libtool

parent 7ca606b4
......@@ -3,9 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS =
bin_SCRIPTS =
noinst_LIBRARIES =
noinst_PROGRAMS =
lib_LIBRARIES =
noinst_HEADERS =
TESTS =
XFAIL_TESTS =
......@@ -28,8 +26,8 @@ AM_LIBS =
AM_CXXFLAGS = $(AM_CFLAGS)
lib_LIBRARIES += src/libabt-io.a
src_libabt_io_a_SOURCES =
lib_LTLIBRARIES = src/libabt-io.la
src_libabt_io_la_SOURCES =
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = maint/abt-io.pc
......
......@@ -34,15 +34,14 @@ dnl
dnl Verify pkg-config
dnl
PKG_PROG_PKG_CONFIG
PKG_CONFIG="pkg-config --static"
PKG_CHECK_MODULES_STATIC([ARGOBOTS],[argobots],[],
PKG_CHECK_MODULES([ARGOBOTS],[argobots],[],
[AC_MSG_ERROR([Could not find working argobots installation!])])
LIBS="$ARGOBOTS_LIBS $LIBS"
CPPFLAGS="$ARGOBOTS_CFLAGS $CPPFLAGS"
CFLAGS="$ARGOBOTS_CFLAGS $CFLAGS"
PKG_CHECK_MODULES_STATIC([ABT_SNOOZER],[abt-snoozer],[],
PKG_CHECK_MODULES([ABT_SNOOZER],[abt-snoozer],[],
[AC_MSG_ERROR([Could not find working abt-snoozer installation!])])
LIBS="$ABT_SNOOZER_LIBS $LIBS"
CPPFLAGS="$ABT_SNOOZER_CFLAGS $CPPFLAGS"
......
......@@ -2,11 +2,11 @@ bin_PROGRAMS += examples/concurrent-write-bench examples/abt-io-overlap examples
examples_concurrent_write_bench_SOURCES = \
examples/concurrent-write-bench.c
examples_concurrent_write_bench_LDADD = src/libabt-io.a
examples_concurrent_write_bench_LDADD = src/libabt-io.la -lpthread
examples_abt_io_overlap_SOURCES = \
examples/abt-io-overlap.c
examples_abt_io_overlap_LDADD = src/libabt-io.a -lcrypto
examples_abt_io_overlap_LDADD = src/libabt-io.la -lcrypto
examples_pthread_overlap_SOURCES = \
examples/pthread-overlap.c
......
......@@ -170,7 +170,7 @@ static void abt_bench(int buffer_per_thread, unsigned int concurrency, size_t si
void *buffer;
double start;
fd = open(filename, O_WRONLY|O_CREAT|O_DIRECT|O_SYNC, S_IWUSR|S_IRUSR);
fd = open(filename, O_WRONLY|O_CREAT|O_SYNC, S_IWUSR|S_IRUSR);
if(!fd)
{
perror("open");
......@@ -286,7 +286,7 @@ static void abt_bench_nb(int buffer_per_thread, unsigned int concurrency, size_t
abt_io_op_t **ops;
ssize_t *wrets;
fd = open(filename, O_WRONLY|O_CREAT|O_DIRECT|O_SYNC, S_IWUSR|S_IRUSR);
fd = open(filename, O_WRONLY|O_CREAT|O_SYNC, S_IWUSR|S_IRUSR);
if(!fd)
{
perror("open");
......@@ -376,7 +376,7 @@ static void pthread_bench(int buffer_per_thread, unsigned int concurrency, size_
void *buffer;
double start;
fd = open(filename, O_WRONLY|O_CREAT|O_DIRECT|O_SYNC, S_IWUSR|S_IRUSR);
fd = open(filename, O_WRONLY|O_CREAT|O_SYNC, S_IWUSR|S_IRUSR);
if(!fd)
{
perror("open");
......
src_libabt_io_a_SOURCES += \
src_libabt_io_la_SOURCES += \
src/abt-io.c
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment