Skip to content

Commit

Permalink
Renamed to libdill
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Sustrik <[email protected]>
  • Loading branch information
sustrik committed Jan 12, 2016
1 parent eeec399 commit 3b1aec1
Show file tree
Hide file tree
Showing 35 changed files with 820 additions and 815 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config.sub
configure
depcomp
install-sh
treestack.pc
libdill.pc
*.o
*.lo
*.la
Expand Down
22 changes: 11 additions & 11 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2015 Martin Sustrik All rights reserved.
# Copyright (c) 2016 Martin Sustrik All rights reserved.
# Copyright (c) 2013 Luca Barbato
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
Expand All @@ -23,15 +23,15 @@
ACLOCAL_AMFLAGS = -I m4

################################################################################
# treestack library #
# libdill library #
################################################################################

treestackincludedir = $(includedir)
treestackinclude_HEADERS = treestack.h
dillincludedir = $(includedir)
dillinclude_HEADERS = libdill.h

lib_LTLIBRARIES = libtreestack.la
lib_LTLIBRARIES = libdill.la

libtreestack_la_SOURCES = \
libdill_la_SOURCES = \
chan.h \
chan.c \
cr.h \
Expand All @@ -54,15 +54,15 @@ libtreestack_la_SOURCES = \
kqueue.inc

pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = treestack.pc
pkgconfig_DATA = libdill.pc

libtreestack_la_LDFLAGS = -no-undefined -version-info @TS_LIBTOOL_VERSION@
libdill_la_LDFLAGS = -no-undefined -version-info @DILL_LIBTOOL_VERSION@

# Turn the source fortification in glibc off - otherwise it would panic
# because of the stack pointer black magic in 'go' macro.
libtreestack_la_CFLAGS = \
libdill_la_CFLAGS = \
-fvisibility=hidden\
-DTS_EXPORTS \
-DDILL_EXPORTS \
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0

################################################################################
Expand All @@ -80,7 +80,7 @@ check_PROGRAMS = \
tests/signals \
tests/overload

LDADD = libtreestack.la
LDADD = libdill.la

TESTS = $(check_PROGRAMS)

Expand Down
12 changes: 6 additions & 6 deletions abi_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.

if [ ! -f treestack.h ]; then
echo "abi_version.sh: error: treestack.h does not exist" 1>&2
if [ ! -f libdill.h ]; then
echo "abi_version.sh: error: libdill.h does not exist" 1>&2
exit 1
fi

CURRENT=`egrep '^#define +TS_VERSION_CURRENT +[0-9]+$' treestack.h`
REVISION=`egrep '^#define +TS_VERSION_REVISION +[0-9]+$' treestack.h`
AGE=`egrep '^#define +TS_VERSION_AGE +[0-9]+$' treestack.h`
CURRENT=`egrep '^#define +DILL_VERSION_CURRENT +[0-9]+$' libdill.h`
REVISION=`egrep '^#define +DILL_VERSION_REVISION +[0-9]+$' libdill.h`
AGE=`egrep '^#define +DILL_VERSION_AGE +[0-9]+$' libdill.h`

if [ -z "$CURRENT" -o -z "$REVISION" -o -z "$AGE" ]; then
echo "abi_version.sh: error: could not extract version from treestack.h" 1>&2
echo "abi_version.sh: error: could not extract version from libdill.h" 1>&2
exit 1
fi

Expand Down
Loading

0 comments on commit 3b1aec1

Please sign in to comment.