Fix make distcheck (up until uninstall check)

Change-Id: I0a963766fa4b4494e7eca53a6edd613632f6cbe1

Makefile.am

 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = src samples doc man
+EXTRA_DIST = resource.sh

doc/Makefile.am

 info_TEXINFOS = knot.texi
-knot_TEXINFOS = 		\
-	introduction.texi	\
-	requirements.texi	\
-	installation.texi	\
-	configuration.texi	\
-	reference.texi		\
-	security.texi		\
-	troubleshooting.texi	\
-	migration.texi
+knot_TEXINFOS = 				\
+		configuration.texi		\
+		indices.texi			\
+		installation.texi		\
+		introduction.texi		\
+		knot.texi			\
+		migration.texi			\
+		reference.texi			\
+		requirements.texi		\
+		running.texi			\
+		security.texi			\
+		troubleshooting.texi		\
+		version.texi

resource.sh

@@ -15,12 +15,12 @@ hd="hexdump -v -e"
 fmt="\"0\" \"x\" 1/1 \"%02X\" \", \""
 
 # Preparse source file name
-header="${1%.*}_rc"
-header=`basename ${header}`
+# header="${1%.*}_rc"
+header=$(basename ${1}_rc)
 
 # Get file size and dump content
-size=`wc -c ${1} | awk '{print $1}' 2>/dev/null`
-dump=`${hd} "${fmt}" ${1} 2>/dev/null`
+size=$(wc -c "${1}" | awk '{print $1}' 2>/dev/null)
+dump=$(${hd} "${fmt}" "${1}" 2>/dev/null)
 
 # Format file size variable
 echo "static const unsigned ${header}_size = ${size};"

samples/Makefile.am

@@ -5,20 +5,20 @@ edit = sed \
 	-e 's|@prefix[@]|$(prefix)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g'
 
-knot.sample.conf: Makefile
+knot.sample.conf: knot.sample.conf.in
 	rm -f $@ $@.tmp
 	srcdir=''; \
 	  test -f ./$@.in || srcdir=$(srcdir)/; \
 	  $(edit) $${srcdir}$@.in >$@.tmp
 	mv $@.tmp $@
 
-knot.sample.conf: knot.sample.conf.in
+EXTRA_DIST = knot.sample.conf.in example.com.zone
 
 install-data-local: knot.sample.conf
 	[ -d $(DESTDIR)/$(sysconfdir) ] || \
 	  $(INSTALL) -d $(DESTDIR)/$(sysconfdir)
 	[ -f $(DESTDIR)/$(sysconfdir)/knot.sample.conf ] || \
-	  $(INSTALL_DATA) knot.sample.conf example.com.zone $(DESTDIR)/$(sysconfdir)
+	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(sysconfdir)
 
 clean-local:
 	rm -f knot.sample.conf

src/Makefile.am

@@ -5,19 +5,25 @@ noinst_PROGRAMS = unittests unittests-xfr zscanner-tool
 noinst_LTLIBRARIES = libknot.la libknotd.la libknots.la libzscanner.la
 
 # $(YACC) will generate header file
-AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE -Wall -Ilibknot -DSYSCONFDIR='"$(sysconfdir)"' -DSBINDIR='"$(sbindir)"'
+AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE -Wall -I$(top_srcdir)/src/libknot -DSYSCONFDIR='"$(sysconfdir)"' -DSBINDIR='"$(sbindir)"'
 AM_YFLAGS = -d
 libknotd_la_YFLAGS = -pcf_ -d
 libknotd_la_LFLAGS = # TODO: reentrant parser, prefix
 
+EXTRA_DIST =					\
+	     tests/files/sample_conf		\
+	     zscanner/scanner.rl		\
+	     zscanner/scanner_body.rl
+
 BUILT_SOURCES =					\
-	tests/sample_conf.rc			\
+	sample_conf.rc				\
 	libknotd_la-cf-lex.c			\
 	libknotd_la-cf-parse.c			\
-	libknotd_la-cf-parse.h
+	libknotd_la-cf-parse.h			\
+	zscanner/scanner.c
 
 CLEANFILES =					\
-	tests/sample_conf.rc			\
+	sample_conf.rc				\
 	libknotd_la-cf-lex.c			\
 	libknotd_la-cf-parse.c			\
 	libknotd_la-cf-parse.h
@@ -138,6 +144,7 @@ unittests_xfr_SOURCES = 			\
 	tests/xfr_tests.h
 
 libknot_la_SOURCES =				\
+	libknot/common.h			\
 	libknot/consts.h			\
 	libknot/consts.c			\
 	libknot/util/utils.c			\
@@ -206,6 +213,7 @@ libknot_la_SOURCES =				\
 libknots_la_SOURCES =				\
 	common/slab/slab.c			\
 	common/slab/slab.h			\
+	common/slab/alloc-common.h		\
 	common/libtap/tap.c			\
 	common/libtap/tap.h			\
 	common/libtap/tap_unit.h		\
@@ -275,7 +283,9 @@ libknotd_la_SOURCES =				\
 	knot/stat/stat.c			\
 	knot/stat/gatherer.h			\
 	knot/stat/stat.h			\
+	knot/stat/stat-common.h			\
 	knot/common.h				\
+	common/latency.h			\
 	knot/other/debug.h			\
 	knot/conf/cf-lex.l			\
 	knot/conf/cf-parse.y			\
@@ -349,5 +359,5 @@ unittests_LDADD = libknotd.la libknots.la @LIBOBJS@
 unittests_xfr_LDADD = libknotd.la libknot.la libknots.la @LIBOBJS@
 zscanner_tool_LDADD = libknots.la libknot.la libknotd.la libzscanner.la @LIBOBJS@
 
-tests/sample_conf.rc: tests/files/sample_conf
-	../resource.sh tests/files/sample_conf >$@
+sample_conf.rc: tests/files/sample_conf
+	$(top_srcdir)/resource.sh $(srcdir)/tests/files/sample_conf >$@

src/tests/knot/conf_tests.c

@@ -20,7 +20,7 @@
 #include "knot/conf/conf.h"
 
 /* Resources. */
-#include "tests/sample_conf.rc"
+#include "sample_conf.rc"
 
 static int conf_tests_count(int argc, char *argv[]);
 static int conf_tests_run(int argc, char *argv[]);