From 90f61c1f81653e29f0f1f72e2df828ee39f8ed3e Mon Sep 17 00:00:00 2001 From: Vito Caputo Date: Tue, 27 Nov 2018 20:55:04 -0800 Subject: *: incorporate libpad submodule In preparation of adding an ix3_reset() method, pull in the libpad allocator which will be used for caching all allocations instead of the libc allocator, and a convenient fast reset. --- .gitmodules | 3 +++ Makefile.am | 2 +- bootstrap | 4 +--- configure.ac | 5 +++++ libpad | 1 + src/Makefile.am | 1 + 6 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 160000 libpad diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..f10f023 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libpad"] + path = libpad + url = git://git.pengaru.com/libpad diff --git a/Makefile.am b/Makefile.am index af437a6..52621f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS = src +SUBDIRS = libpad src diff --git a/bootstrap b/bootstrap index 99f6f06..c5a7472 100755 --- a/bootstrap +++ b/bootstrap @@ -1,5 +1,3 @@ #!/bin/sh -aclocal \ -&& automake --gnu --add-missing \ -&& autoconf +autoreconf --install diff --git a/configure.ac b/configure.ac index 3110d14..92a0bd6 100644 --- a/configure.ac +++ b/configure.ac @@ -10,4 +10,9 @@ AC_CONFIG_FILES([ Makefile src/Makefile ]) + +AC_CONFIG_SUBDIRS([ + libpad +]) + AC_OUTPUT diff --git a/libpad b/libpad new file mode 160000 index 0000000..16b9b42 --- /dev/null +++ b/libpad @@ -0,0 +1 @@ +Subproject commit 16b9b42cecc81f7540aef85459cf1fa191fa641c diff --git a/src/Makefile.am b/src/Makefile.am index 53fe025..92d947f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,2 +1,3 @@ noinst_LIBRARIES = libix3.a libix3_a_SOURCES = list.h ix3.c ix3.h +libix3_a_CPPFLAGS = -I@top_srcdir@/libpad/src -- cgit v1.2.3