Commit bcf55c69 authored by Philip Carns's avatar Philip Carns

finish libtool conversion in margo

parent efaa1aba
......@@ -3,9 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS =
bin_SCRIPTS =
noinst_LIBRARIES =
noinst_PROGRAMS =
lib_LIBRARIES =
noinst_HEADERS =
TESTS =
XFAIL_TESTS =
......@@ -29,10 +27,10 @@ AM_LIBS =
AM_CXXFLAGS = $(AM_CFLAGS)
lib_LIBRARIES += src/libmargo.a
src_libmargo_a_SOURCES =
lib_LTLIBRARIES = src/libmargo.la
src_libmargo_la_SOURCES =
LDADD = src/libmargo.a
LDADD = src/libmargo.la
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = maint/margo.pc
......
......@@ -57,21 +57,20 @@ dnl
dnl Verify pkg-config
dnl
PKG_PROG_PKG_CONFIG
PKG_CONFIG="pkg-config --static"
PKG_CHECK_MODULES_STATIC([MERCURY],[mercury],[],
PKG_CHECK_MODULES([MERCURY],[mercury],[],
[AC_MSG_ERROR([Could not find working mercury installation!])])
LIBS="$MERCURY_LIBS $LIBS"
CPPFLAGS="$MERCURY_CFLAGS $CPPFLAGS"
CFLAGS="$MERCURY_CFLAGS $CFLAGS"
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"
......
src_libmargo_a_SOURCES += \
src_libmargo_la_SOURCES += \
src/margo.c \
src/margo-timer.h \
src/margo-timer.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