* src/Makefile.am: New convenience library libbinlog.a

* src/binlogcat.c: Use functions from libbinlog.a
* src/err.h: New file.
* src/err.c: New file.
* tests/.gitignore: Add binpack.c
* tests/Makefile.am: Build binpack.c
* tests/binpack.c: New file.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9ce519f..4e31e89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,15 +13,19 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with vmod-binlog.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(VARNISHSRC)/include -I$(VARNISHSRC)
 
+noinst_LIBRARIES = libbinlog.a
+libbinlog_a_SOURCES = pack.c err.c
+libbinlog_a_CFLAGS = $(AM_CFLAGS)
+
 bin_PROGRAMS = binlogcat
-binlogcat_SOURCES = binlogcat.c pack.c
-binlogcat_CFLAGS = $(AM_CFLAGS)
+binlogcat_SOURCES = binlogcat.c
+binlogcat_LDADD = ./libbinlog.a
 
 vmoddir = $(VMODDIR)
 vmod_LTLIBRARIES = libvmod_binlog.la
 
 libvmod_binlog_la_LDFLAGS = -module -export-dynamic -avoid-version
 libvmod_binlog_la_LIBADD=
@@ -29,13 +33,13 @@ libvmod_binlog_la_LIBADD=
 libvmod_binlog_la_SOURCES = \
         binlog.c\
         pack.c\
         vmod-binlog.h\
         vcc_if.c vcc_if.h
 
-noinst_HEADERS = pack.h
+noinst_HEADERS = pack.h err.h
 
 BUILT_SOURCES = vcc_if.c vcc_if.h
 
 vcc_if.c vcc_if.h: $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod.vcc
         @PYTHON@ $(VARNISHSRC)/lib/libvmod_std/vmod.py $(top_srcdir)/src/vmod.vcc