Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
margo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
17
Issues
17
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
sds
margo
Commits
bcf55c69
Commit
bcf55c69
authored
Sep 04, 2016
by
Philip Carns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
finish libtool conversion in margo
parent
efaa1aba
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
10 deletions
+7
-10
Makefile.am
Makefile.am
+3
-5
configure.ac
configure.ac
+3
-4
src/Makefile.subdir
src/Makefile.subdir
+1
-1
No files found.
Makefile.am
View file @
bcf55c69
...
...
@@ -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_L
IBRARIES
+=
src/libmargo.
a
src_libmargo_a_SOURCES
=
lib_L
TLIBRARIES
=
src/libmargo.l
a
src_libmargo_
l
a_SOURCES
=
LDADD
=
src/libmargo.a
LDADD
=
src/libmargo.
l
a
pkgconfigdir
=
$(libdir)
/pkgconfig
pkgconfig_DATA
=
maint/margo.pc
...
...
configure.ac
View file @
bcf55c69
...
...
@@ -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/Makefile.subdir
View file @
bcf55c69
src_libmargo_a_SOURCES
+=
\
src_libmargo_
l
a_SOURCES
+=
\
src/margo.c
\
src/margo-timer.h
\
src/margo-timer.c
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