Commit 8760b4df authored by Jonathan Jenkins's avatar Jonathan Jenkins
Browse files

enable libtool

parent 7122778f
...@@ -3,9 +3,9 @@ ACLOCAL_AMFLAGS = -I m4 ...@@ -3,9 +3,9 @@ ACLOCAL_AMFLAGS = -I m4
bin_PROGRAMS = bin_PROGRAMS =
bin_SCRIPTS = bin_SCRIPTS =
noinst_LIBRARIES = noinst_LTLIBRARIES =
noinst_PROGRAMS = noinst_PROGRAMS =
lib_LIBRARIES = lib_LTLIBRARIES =
noinst_HEADERS = noinst_HEADERS =
TESTS = TESTS =
XFAIL_TESTS = XFAIL_TESTS =
...@@ -38,12 +38,12 @@ noinst_HEADERS += \ ...@@ -38,12 +38,12 @@ noinst_HEADERS += \
ssg-config.h \ ssg-config.h \
examples/rpc.h examples/rpc.h
lib_LIBRARIES += src/libssg.a lib_LTLIBRARIES += src/libssg.la
src_libssg_a_SOURCES = src/ssg.c src_libssg_la_SOURCES = src/ssg.c
noinst_PROGRAMS += examples/ssg-example noinst_PROGRAMS += examples/ssg-example
examples_ssg_example_SOURCES = examples/ssg-example.c examples/rpc.c examples_ssg_example_SOURCES = examples/ssg-example.c examples/rpc.c
examples_ssg_example_LDADD = src/libssg.a examples_ssg_example_LDADD = src/libssg.la
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = maint/ssg.pc pkgconfig_DATA = maint/ssg.pc
......
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.67]) AC_PREREQ([2.63])
AC_INIT([ssg], [0.1], [],[],[]) AC_INIT([ssg], [0.1], [],[],[])
AC_CONFIG_MACRO_DIR([m4])
LT_INIT
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
...@@ -15,14 +17,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ...@@ -15,14 +17,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_SRCDIR([README.md]) AC_CONFIG_SRCDIR([README.md])
AC_CONFIG_HEADERS([ssg-config.h]) AC_CONFIG_HEADERS([ssg-config.h])
AC_CONFIG_MACRO_DIR([m4])
AC_LANG([C])
# Checks for programs. # Checks for programs.
AC_PROG_CC AC_PROG_CC
AC_PROG_CC_C99 AC_PROG_CC_C99
AC_PROG_RANLIB
dnl dnl
dnl Add warning flags by default dnl Add warning flags by default
...@@ -74,7 +72,7 @@ AC_ARG_ENABLE([margo], ...@@ -74,7 +72,7 @@ AC_ARG_ENABLE([margo],
esac]) esac])
if test "x${check_margo}" = xauto -o "x${check_margo}" = xyes ; then if test "x${check_margo}" = xauto -o "x${check_margo}" = xyes ; then
PKG_CHECK_MODULES_STATIC([MARGO],[margo], PKG_CHECK_MODULES([MARGO],[margo],
[AC_DEFINE([HAVE_MARGO], [1], [Define to 1 if compiled with Margo support]) [AC_DEFINE([HAVE_MARGO], [1], [Define to 1 if compiled with Margo support])
LIBS="$MARGO_LIBS $LIBS" LIBS="$MARGO_LIBS $LIBS"
CPPFLAGS="$MARGO_CFLAGS $CPPFLAGS" CPPFLAGS="$MARGO_CFLAGS $CPPFLAGS"
...@@ -89,7 +87,7 @@ fi ...@@ -89,7 +87,7 @@ fi
AM_CONDITIONAL([HAVE_MARGO], [test "x${check_margo_status}" = xsuccess]) AM_CONDITIONAL([HAVE_MARGO], [test "x${check_margo_status}" = xsuccess])
# mercury check goes last - libs should be linked in before margo # mercury check goes last - libs should be linked in before margo
PKG_CHECK_MODULES_STATIC([MERCURY],[mercury], PKG_CHECK_MODULES([MERCURY],[mercury],
[LIBS="$MERCURY_LIBS $LIBS" [LIBS="$MERCURY_LIBS $LIBS"
CPPFLAGS="$MERCURY_CFLAGS $CPPFLAGS" CPPFLAGS="$MERCURY_CFLAGS $CPPFLAGS"
CFLAGS="$MERCURY_CFLAGS $CFLAGS"]) CFLAGS="$MERCURY_CFLAGS $CFLAGS"])
......
...@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ ...@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: margo Name: ssg
Description: Simple Stupid Group (SSG) interface for Mercury Description: Simple Stupid Group (SSG) interface for Mercury
Version: 0.1 Version: 0.1
URL: https://xgitlab.cels.anl.gov/sds/margo URL: https://xgitlab.cels.anl.gov/sds/margo
......
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