Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
sds
ssg
Commits
8760b4df
Commit
8760b4df
authored
Sep 20, 2016
by
Jonathan Jenkins
Browse files
enable libtool
parent
7122778f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
8760b4df
...
@@ -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_
LT
LIBRARIES
=
noinst_PROGRAMS
=
noinst_PROGRAMS
=
lib_LIBRARIES
=
lib_
LT
LIBRARIES
=
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_
LT
LIBRARIES
+=
src/libssg.
l
a
src_libssg_a_SOURCES
=
src/ssg.c
src_libssg_
l
a_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.
l
a
pkgconfigdir
=
$(libdir)
/pkgconfig
pkgconfigdir
=
$(libdir)
/pkgconfig
pkgconfig_DATA
=
maint/ssg.pc
pkgconfig_DATA
=
maint/ssg.pc
...
...
configure.ac
View file @
8760b4df
# -*- 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.6
7
])
AC_PREREQ([2.6
3
])
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"])
...
...
maint/ssg.pc.in
View file @
8760b4df
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment