Commit db55a201 authored by Philip Carns's avatar Philip Carns

finish converting bake bulk to libtool

parent ebd63c57
......@@ -3,9 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS =
bin_SCRIPTS =
noinst_LIBRARIES =
noinst_PROGRAMS =
lib_LIBRARIES =
noinst_HEADERS =
TESTS =
XFAIL_TESTS =
......@@ -28,10 +26,10 @@ AM_LIBS =
AM_CXXFLAGS = $(AM_CFLAGS)
lib_LIBRARIES += src/libbake-bulk.a
src_libbake_bulk_a_SOURCES =
lib_LTLIBRARIES = src/libbake-bulk.la
src_libbake_bulk_la_SOURCES =
LDADD = src/libbake-bulk.a
LDADD = src/libbake-bulk.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = maint/bake-bulk.pc
......
......@@ -34,9 +34,8 @@ dnl
dnl Verify pkg-config
dnl
PKG_PROG_PKG_CONFIG
PKG_CONFIG="pkg-config --static"
PKG_CHECK_MODULES_STATIC([MARGO],[margo],[],
PKG_CHECK_MODULES([MARGO],[margo],[],
[AC_MSG_ERROR([Could not find working margo installation!])])
LIBS="$MARGO_LIBS $LIBS"
CPPFLAGS="$MARGO_CFLAGS $CPPFLAGS"
......@@ -44,13 +43,13 @@ CFLAGS="$MARGO_CFLAGS $CFLAGS"
# NOTE: See README.md if the following does not work for you; some versions of
# nvml/pmem install broken .pc files
PKG_CHECK_MODULES_STATIC([LIBPMEMOBJ],[libpmemobj],[],
PKG_CHECK_MODULES([LIBPMEMOBJ],[libpmemobj],[],
[AC_MSG_ERROR([Could not find working libpmemobj installation!])])
LIBS="$LIBPMEMOBJ_LIBS $LIBS"
CPPFLAGS="$LIBPMEMOBJ_CFLAGS $CPPFLAGS"
CFLAGS="$LIBPMEMOBJ_CFLAGS $CFLAGS"
PKG_CHECK_MODULES_STATIC([UUID],[uuid],[],
PKG_CHECK_MODULES([UUID],[uuid],[],
[AC_MSG_ERROR([Could not find working uuid installation!])])
LIBS="$UUID_LIBS $LIBS"
CPPFLAGS="$UUID_CFLAGS $CPPFLAGS"
......
src_libbake_bulk_a_SOURCES += \
src_libbake_bulk_la_SOURCES += \
src/bake-bulk.c
bin_PROGRAMS += \
......
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