diff --git a/Makefile.am b/Makefile.am index 92e259516b0e6690fcc9be6b9f423f495d84b3a4..3ed7af8f138947550b4eccef6120a133654a19c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index acad93bc8a7695dbd39f1f4ed83a68e0431011b7..66da8dd8311071b186feb3d50a4700a144581c1c 100755 --- a/configure.ac +++ b/configure.ac @@ -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" diff --git a/src/Makefile.subdir b/src/Makefile.subdir index 00043c89afbfea296e60b3d1308a44c21ddced7a..922b485edec2aa1d026b1cc2fc4d8421996f09af 100644 --- a/src/Makefile.subdir +++ b/src/Makefile.subdir @@ -1,4 +1,4 @@ -src_libmargo_a_SOURCES += \ +src_libmargo_la_SOURCES += \ src/margo.c \ src/margo-timer.h \ src/margo-timer.c