Commit 79ceed90 authored by Daniel Salzman's avatar Daniel Salzman

vpool: move to libcontrib

parent 37193f83
......@@ -53,6 +53,8 @@ src/contrib/ucw/lists.c
src/contrib/ucw/lists.h
src/contrib/ucw/mempool.c
src/contrib/ucw/mempool.h
src/contrib/vpool/vpool.c
src/contrib/vpool/vpool.h
src/contrib/wire_ctx.h
src/knot/common/evsched.c
src/knot/common/evsched.h
......@@ -237,8 +239,6 @@ src/knot/zone/zonefile.c
src/knot/zone/zonefile.h
src/libdnssec/binary.c
src/libdnssec/binary.h
src/libdnssec/contrib/vpool.c
src/libdnssec/contrib/vpool.h
src/libdnssec/crypto.c
src/libdnssec/crypto.h
src/libdnssec/dnssec.h
......
......@@ -58,7 +58,9 @@ libcontrib_la_SOURCES = \
contrib/ucw/lists.c \
contrib/ucw/lists.h \
contrib/ucw/mempool.c \
contrib/ucw/mempool.h
contrib/ucw/mempool.h \
contrib/vpool/vpool.c \
contrib/vpool/vpool.h
if !HAVE_LMDB
libcontrib_la_SOURCES += \
......
......@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include "libdnssec/contrib/vpool.h"
#include "contrib/vpool/vpool.h"
static void vpool_shift(struct vpool *pool);
static int vpool_new_size(struct vpool *pool, size_t datsize,
......
......@@ -23,7 +23,7 @@ libshared_la_SOURCES = \
libdnssec_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(gnutls_CFLAGS)
libdnssec_la_LDFLAGS = $(AM_LDFLAGS) $(libdnssec_VERSION_INFO) $(LDFLAG_EXCLUDE_LIBS)
libdnssec_la_LIBADD = libshared.la $(gnutls_LIBS)
libdnssec_la_LIBADD = libshared.la libcontrib.la $(gnutls_LIBS)
include_libdnssecdir = $(includedir)/libdnssec
include_libdnssec_HEADERS = \
......@@ -43,8 +43,6 @@ include_libdnssec_HEADERS = \
libdnssec/version.h
libdnssec_la_SOURCES = \
libdnssec/contrib/vpool.c \
libdnssec/contrib/vpool.h \
libdnssec/binary.c \
libdnssec/crypto.c \
libdnssec/error.c \
......
......@@ -21,6 +21,7 @@
#include <gnutls/crypto.h>
#include "contrib/macros.h"
#include "contrib/vpool/vpool.h"
#include "libdnssec/shared/bignum.h"
#include "libdnssec/error.h"
#include "libdnssec/key.h"
......@@ -29,7 +30,6 @@
#include "libdnssec/sign.h"
#include "libdnssec/sign/der.h"
#include "libdnssec/shared/binary_wire.h"
#include "libdnssec/contrib/vpool.h"
/*!
* Signature format conversion callback.
......
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