libs: update Makefiles

.gitignore

@@ -54,7 +54,7 @@
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
 /src/knotd.pc
-/src/libknot.pc
+/src/libknot/libknot.pc
 /src/libknot/version.h
 /src/knot/modules/static_modules.h
 /test-driver

configure.ac

@@ -60,7 +60,7 @@ LT_INIT
 PKG_PROG_PKG_CONFIG
 m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdir}/pkgconfig'])])
 AC_CONFIG_FILES([src/knotd.pc
-                 src/libknot.pc
+                 src/libknot/libknot.pc
                  src/libdnssec/libdnssec.pc
                  src/libzscanner/libzscanner.pc
                  ])

src/Makefile.am

@@ -164,7 +164,7 @@ libknot_la_LDFLAGS  = $(AM_LDFLAGS) $(libknot_VERSION_INFO) $(lmdb_LIBS) \
 libknot_la_LIBADD   = libdnssec/libdnssec.la libcontrib.la
 
 # pkg-config
-pkgconfig_DATA = knotd.pc libknot.pc
+pkgconfig_DATA = knotd.pc libknot/libknot.pc
 
 # static: utilities shared
 libknotus_la_SOURCES =				\

src/libdnssec/Makefile.am

 AM_CPPFLAGS = \
 	-include $(top_builddir)/src/config.h \
-	-I$(top_srcdir)/src
+	-I$(top_srcdir)/src \
 	$(gnutls_CFLAGS)
 
 noinst_LTLIBRARIES = libshared.la
@@ -36,8 +36,8 @@ libdnssec_la_LDFLAGS = \
 libdnssec_la_LIBADD = \
 	libshared.la
 
-include_dnssecdir=$(includedir)/dnssec
-include_dnssec_HEADERS = \
+include_libdnssecdir=$(includedir)/libdnssec
+include_libdnssec_HEADERS = \
 	binary.h \
 	crypto.h \
 	dnssec.h \

src/libzscanner/Makefile.am

@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
 
 lib_LTLIBRARIES = libzscanner.la
 
-zscanner_ladir = $(includedir)/zscanner
-nobase_zscanner_la_HEADERS =		\
+libzscanner_ladir = $(includedir)/libzscanner
+nobase_libzscanner_la_HEADERS =		\
 	error.h				\
 	scanner.h			\
 	version.h
@@ -36,7 +36,7 @@ libzscanner_la_SOURCES =		\
 	error.c				\
 	functions.h			\
 	functions.c			\
-	$(nobase_zscanner_la_HEADERS)
+	$(nobase_libzscanner_la_HEADERS)
 
 nodist_libzscanner_la_SOURCES =		\
 	scanner.c