Separate headers as well. Clean up -I's.

33 files changed, 133 insertions, 154 deletions

diff --git a/Makefile.am b/Makefile.am
index 69f0c0dae3..e89a0dd4d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-SUBDIRS = gl includes lib libextra src doc tests
+SUBDIRS = gl lib libextra src doc tests
 
 if HAVE_GUILE
 SUBDIRS += guile
diff --git a/configure.in b/configure.in
index f590a472a7..b93c40c5ef 100644
--- a/configure.in
+++ b/configure.in
@@ -29,12 +29,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.10 dist-bzip2 -Wall -Werror -Wno-override])
 AM_CONFIG_HEADER(config.h)
 
-# Compute numeric versions, used in includes/gnutls/gnutls.h.in.
-AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`)
-AC_SUBST(MINOR_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`)
-AC_SUBST(PATCH_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\..*\.\(.*\)/\1/g'`)
-AC_SUBST(NUMBER_VERSION, `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSION $PATCH_VERSION`)
-
 opt_developer_mode=no
 AC_MSG_CHECKING([whether to enable compiler warnings])
 AC_ARG_ENABLE(developer-mode,
@@ -313,7 +307,6 @@ AC_CONFIG_FILES([Makefile \
 	tests/pkcs12-decode/Makefile tests/pathlen/Makefile \
 	tests/key-id/Makefile tests/sha2/Makefile \
 	tests/hostname-check/Makefile \
-	includes/Makefile includes/gnutls/gnutls.h \
 	tests/openpgp/Makefile tests/openpgp-certs/Makefile \
 	src/Makefile \
 	src/cfg/Makefile src/cfg/platon/Makefile src/cfg/platon/str/Makefile \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5c093c846b..68a09124c1 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -144,8 +144,9 @@ if HAVE_GUILE
 GUILE_FOR_BUILD = $(GUILE) -L $(top_srcdir)/guile/modules
 
 SNARF_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)			\
-		 -I$(top_srcdir)/includes -I$(top_builddir)/includes	\
-	         -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src
+	 -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes	\
+	 -I$(top_srcdir)/libextra/includes				\
+         -I$(top_srcdir)/guile/src -I$(top_builddir)/guile/src
 
 core.c.texi: $(top_srcdir)/guile/src/core.c
 	$(MAKE) -C ../guile/src built-sources &&			\
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index df39364b03..a841b81b2f 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -19,9 +19,11 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes \
-		-I$(top_srcdir)/lgl -I$(top_builddir)/lgl \
-		-I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes	\
+	-I$(top_srcdir)/libextra/includes				\
+	-I$(top_srcdir)/gl -I$(top_builddir)/gl
+
 AM_LDFLAGS = -no-install
 LDADD = libexamples.la \
 	../../lib/libgnutls.la	\
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 171d5aac7b..acd8cec030 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -18,7 +18,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../lib --source-dir=../../libextra --source-dir=../../includes
+DOC_SOURCE_DIR=../../lib --source-dir=../../libextra
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=
@@ -45,12 +45,13 @@ FIXXREF_OPTIONS=
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/includes/gnutls/*.h $(top_builddir)/includes/gnutls/*.h
+HFILE_GLOB=$(top_srcdir)/lib/includes/gnutls/*.h $(top_builddir)/lib/includes/gnutls/*.h $(top_srcdir)/libextra/includes/gnutls/*.h
 CFILE_GLOB=$(top_srcdir)/lib/*.c \
 	$(top_srcdir)/lib/x509/*.c \
 	$(top_srcdir)/lib/openpgp/*.c \
 	$(top_srcdir)/libextra/*.c \
-	$(top_srcdir)/lib/minitasn1/*.c
+	$(top_srcdir)/lib/minitasn1/*.c \
+	$(top_srcdir)/libextra/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index 0c6799c3fd..622ecaa333 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -58,8 +58,11 @@ libguile_gnutls_extra_v_1_la_LIBADD =		\
   $(builddir)/libguile-gnutls-v-1.la		\
   $(GNULIB_LIBS) $(GUILE_LDFLAGS)
 
-AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes	\
-              -I$(top_builddir) -I$(builddir)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib/includes \
+	-I$(top_builddir)/lib/includes	\
+	-I$(top_srcdir)/libextra/includes \
+	-I$(builddir)
 
 if HAVE_GCC
 
diff --git a/includes/Makefile.am b/includes/Makefile.am
deleted file mode 100644
index a9ef64a9d2..0000000000
--- a/includes/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
-#
-# Author: Nikos Mavroyanopoulos
-#
-# This file is part of GNUTLS.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this file; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-nobase_include_HEADERS = gnutls/extra.h gnutls/x509.h gnutls/pkcs12.h	\
-	gnutls/compat.h gnutls/openpgp.h gnutls/crypto.h
-
-if ENABLE_OPENSSL
-nobase_include_HEADERS += gnutls/openssl.h
-endif
-
-if ENABLE_CXX
-nobase_include_HEADERS += gnutls/gnutlsxx.h
-endif
-
-nobase_nodist_include_HEADERS = gnutls/gnutls.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 050b154a9a..1134b640a6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,16 +22,18 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 
-SUBDIRS = gl po x509
+SUBDIRS = gl includes po x509
 if ENABLE_MINITASN1
 SUBDIRS += minitasn1
 endif
 
 localedir = $(datadir)/locale
 
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"				\
-	-I$(srcdir)/gl -I$(builddir)/gl					\
-	-I$(srcdir)/../includes -I$(builddir)../includes		\
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"	\
+	-I$(srcdir)/gl				\
+	-I$(builddir)/gl			\
+	-I$(srcdir)/includes			\
+	-I$(builddir)/includes			\
 	-I$(srcdir)/x509
 
 if ENABLE_OPENPGP
diff --git a/lib/configure.ac b/lib/configure.ac
index 1ca90f3ff9..e7c469ea48 100644
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -29,6 +29,12 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
 AM_CONFIG_HEADER(config.h)
 
+# Compute numeric versions, used in includes/gnutls/gnutls.h.in.
+AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`)
+AC_SUBST(MINOR_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`)
+AC_SUBST(PATCH_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\..*\.\(.*\)/\1/g'`)
+AC_SUBST(NUMBER_VERSION, `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSION $PATCH_VERSION`)
+
 AC_PROG_CC
 lgl_EARLY
 
@@ -71,6 +77,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS)
 
 AC_CONFIG_FILES([ \
   Makefile \
+  includes/Makefile
+  includes/gnutls/gnutls.h \
   minitasn1/Makefile \
   x509/Makefile \
   openpgp/Makefile \
diff --git a/lib/includes/Makefile.am b/lib/includes/Makefile.am
new file mode 100644
index 0000000000..8f0e4e90bf
--- /dev/null
+++ b/lib/includes/Makefile.am
@@ -0,0 +1,30 @@
+## Process this file with automake to produce Makefile.in
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GNUTLS.
+#
+# The GNUTLS library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# The GNUTLS library is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with the GNUTLS library; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
+
+nobase_include_HEADERS = gnutls/x509.h gnutls/pkcs12.h gnutls/compat.h	\
+	gnutls/openpgp.h gnutls/crypto.h
+
+if ENABLE_CXX
+nobase_include_HEADERS += gnutls/gnutlsxx.h
+endif
+
+nobase_nodist_include_HEADERS = gnutls/gnutls.h
diff --git a/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index c1abbf9175..c1abbf9175 100644
--- a/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
diff --git a/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index 24813c0935..24813c0935 100644
--- a/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
diff --git a/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 709d7929a7..709d7929a7 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
diff --git a/includes/gnutls/gnutlsxx.h b/lib/includes/gnutls/gnutlsxx.h
index 455fa2425f..455fa2425f 100644
--- a/includes/gnutls/gnutlsxx.h
+++ b/lib/includes/gnutls/gnutlsxx.h
diff --git a/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index ecb05183c8..ecb05183c8 100644
--- a/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
diff --git a/includes/gnutls/pkcs12.h b/lib/includes/gnutls/pkcs12.h
index eb32e436f7..eb32e436f7 100644
--- a/includes/gnutls/pkcs12.h
+++ b/lib/includes/gnutls/pkcs12.h
diff --git a/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index c0e86b5365..c0e86b5365 100644
--- a/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index aed03f6e0a..ed5361b78d 100644
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -20,9 +20,12 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA
 
-AM_CPPFLAGS = -I$(top_srcdir)/lib \
-	-I$(top_srcdir)/includes -I$(top_builddir)/includes \
-	-I$(top_srcdir)/lgl -I$(top_builddir)/lgl
+AM_CPPFLAGS = \
+	-I$(srcdir)/../gl \
+	-I$(builddir)/../gl \
+	-I$(srcdir)/../includes \
+	-I$(builddir)/../includes \
+	-I$(srcdir)/..
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 951186103e..93c1665123 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -20,8 +20,12 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA
 
-AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gl -I$(builddir)/../gl	\
-	-I$(top_srcdir)/includes -I$(top_builddir)/includes \
+AM_CPPFLAGS = \
+	-I$(srcdir)/../gl		\
+	-I$(builddir)/../gl		\
+	-I$(srcdir)/../includes 	\
+	-I$(builddir)/../includes	\
+	-I$(srcdir)/..			\
 	-I$(srcdir)/../opencdk
 
 if ENABLE_MINITASN1
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 1bc9bd9bd0..24a9b024e1 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -18,8 +18,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA
 
-AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gl -I$(builddir)/../gl	\
-	-I$(top_srcdir)/includes -I$(top_builddir)/includes		\
+AM_CPPFLAGS = \
+	-I$(srcdir)/../gl		\
+	-I$(builddir)/../gl		\
+	-I$(srcdir)/../includes 	\
+	-I$(builddir)/../includes	\
+	-I$(srcdir)/..			\
 	$(LIBOPENCDK_CFLAGS)
 
 if ENABLE_MINITASN1
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index d8441b4860..a0c742144b 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -22,16 +22,20 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I ../lib/m4
 
-AM_CPPFLAGS = -I$(srcdir)/gl						\
-	-I$(srcdir)/../lib/gl -I$(builddir)/../lib/gl			\
-	-I$(srcdir)/../lib						\
-	-I$(builddir)/../includes -I$(srcdir)/../includes
+AM_CPPFLAGS = \
+	-I$(srcdir)/../lib/gl		\
+	-I$(builddir)/../lib/gl		\
+	-I$(srcdir)/gl			\
+	-I$(builddir)/../lib/includes	\
+	-I$(srcdir)/../lib/includes	\
+	-I$(srcdir)/includes		\
+	-I$(srcdir)/../lib
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
 endif
 
-SUBDIRS = gl
+SUBDIRS = gl includes
 
 # Pkg-config script.
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/libextra/configure.ac b/libextra/configure.ac
index 4c5a55e0fd..ee2950d465 100644
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -77,6 +77,7 @@ AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
 
 AC_CONFIG_FILES([ \
   Makefile \
+  includes/Makefile
   gl/Makefile \
   gnutls-extra.pc \
 ])
diff --git a/libextra/includes/Makefile.am b/libextra/includes/Makefile.am
new file mode 100644
index 0000000000..71b43c48d3
--- /dev/null
+++ b/libextra/includes/Makefile.am
@@ -0,0 +1,27 @@
+## Process this file with automake to produce Makefile.in
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+#
+# Author: Nikos Mavrogiannopoulos
+#
+# This file is part of GNUTLS-EXTRA.
+#
+# GNUTLS-EXTRA is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+#
+# GNUTLS-EXTRA is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNUTLS-EXTRA; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+nobase_include_HEADERS = gnutls/extra.h
+
+if ENABLE_OPENSSL
+nobase_include_HEADERS += gnutls/openssl.h
+endif
diff --git a/includes/gnutls/extra.h b/libextra/includes/gnutls/extra.h
index 3b96604304..3b96604304 100644
--- a/includes/gnutls/extra.h
+++ b/libextra/includes/gnutls/extra.h
diff --git a/includes/gnutls/openssl.h b/libextra/includes/gnutls/openssl.h
index 106d5a53c7..106d5a53c7 100644
--- a/includes/gnutls/openssl.h
+++ b/libextra/includes/gnutls/openssl.h
diff --git a/src/Makefile.am b/src/Makefile.am
index bcc3cb939f..2d8ee6415c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,12 @@ EXTRA_DIST = README README.srptool
 
 SUBDIRS = cfg
 
-AM_CPPFLAGS = -I$(builddir)../includes -I$(srcdir)/..includes \
-	-I$(srcdir)/../lib/gl -I$(builddir)/../lib/gl \
-	-I$(srcdir)/../gl -I$(builddir)/../gl \
+AM_CPPFLAGS = \
+	-I$(srcdir)/../gl			\
+	-I$(builddir)/../gl			\
+	-I$(builddir)../lib/includes		\
+	-I$(srcdir)/../lib/includes		\
+	-I$(srcdir)/../libextra/includes	\
 	-I$(srcdir)/cfg
 
 bin_PROGRAMS = gnutls-serv gnutls-cli psktool gnutls-cli-debug
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8008d9fb7f..ad5ffda9b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,11 +26,11 @@ if ENABLE_OPENPGP
 SUBDIRS += openpgp openpgp-certs
 endif
 
-EXTRA_DIST = libgcrypt.supp
+EXTRA_DIST = libgcrypt.supp hostname-check.README
 
 AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl			\
 	-I$(top_srcdir)/gl -I$(top_builddir)/gl				\
-	-I$(top_srcdir)/includes -I$(top_builddir)/includes		\
+	-I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes	\
 	-I$(top_srcdir)/lib 						\
 	-I$(top_srcdir)/doc/examples
 AM_LDFLAGS = -no-install
@@ -47,7 +47,7 @@ libutils_la_SOURCES = utils.h utils.c
 
 ctests = simple openssl gc set_pkcs12_cred certder mpi			\
 	certificate_set_x509_crl dn parse_ca moredn crypto_rng mini	\
-	finished
+	finished hostname-check openpgp-keyring
 openssl_LDADD = $(LDADD) ../libextra/libgnutls-openssl.la
 
 if ENABLE_OPENPGP
diff --git a/tests/hostname-check/README b/tests/hostname-check.README
index dec0af63e6..dec0af63e6 100644
--- a/tests/hostname-check/README
+++ b/tests/hostname-check.README
diff --git a/tests/hostname-check/hostname-check.c b/tests/hostname-check.c
index 183ee1a283..183ee1a283 100644
--- a/tests/hostname-check/hostname-check.c
+++ b/tests/hostname-check.c
diff --git a/tests/hostname-check/Makefile.am b/tests/hostname-check/Makefile.am
deleted file mode 100644
index 34fdd5ac7c..0000000000
--- a/tests/hostname-check/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007 Free Software Foundation
-#
-# Author: Simon Josefsson
-#
-# This file is part of GNUTLS.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this file; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl			\
-	-I$(top_srcdir)/gl -I$(top_builddir)/gl				\
-	-I$(top_srcdir)/includes -I$(top_builddir)/includes		\
-	-I$(top_srcdir)/tests
-AM_LDFLAGS = -no-install
-LDADD = ../../lib/libgnutls.la ../libutils.la
-
-ctests = hostname-check
-
-check_PROGRAMS = $(ctests)
-
-TESTS = $(ctests)
-
-TESTS_ENVIRONMENT = $(VALGRIND)
diff --git a/tests/openpgp/keyring.c b/tests/openpgp-keyring.c
index 8b5e259e4f..8b5e259e4f 100644
--- a/tests/openpgp/keyring.c
+++ b/tests/openpgp-keyring.c
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
deleted file mode 100644
index 859648f61e..0000000000
--- a/tests/openpgp/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2007 Free Software Foundation
-#
-# Author: Ludovic Courtès.
-#
-# This file is part of GNUTLS.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this file; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-openpgp_sources = keyring.c
-
-if ENABLE_OPENPGP
-TESTS_ENVIRONMENT = $(VALGRIND)
-
-TESTS = keyring
-
-check_PROGRAMS = keyring
-
-AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes	\
-	      -I$(top_srcdir)/tests
-LDADD = -L$(top_builddir)/libextra -lgnutls-extra	\
-        -L$(top_builddir)/lib      -lgnutls		\
-	-L$(top_builddir)/tests    -lutils
-
-else
-
-EXTRA_DIST = $(openpgp_sources)
-
-endif
-
diff --git a/tests/pkcs12-decode/Makefile.am b/tests/pkcs12-decode/Makefile.am
index a1343184b7..0ce2ac96b7 100644
--- a/tests/pkcs12-decode/Makefile.am
+++ b/tests/pkcs12-decode/Makefile.am
@@ -28,11 +28,14 @@ TESTS = pkcs12 pkcs12_s2k
 check_PROGRAMS = pkcs12_s2k
 
 AM_CPPFLAGS = \
-	-I$(srcdir)/.. 							\
-	-I$(top_srcdir)/gl -I$(top_builddir)/gl				\
-	-I$(top_srcdir)/includes -I$(top_builddir)/includes		\
-	-I$(top_srcdir)/lib 						\
+	-I$(top_srcdir)/gl		\
+	-I$(top_builddir)/gl		\
+	-I$(top_srcdir)/lib/includes	\
+	-I$(top_builddir)/lib/includes	\
+	-I$(srcdir)/..			\
+	-I$(top_srcdir)/lib		\
 	-I$(top_srcdir)/doc/examples
+
 AM_LDFLAGS = -no-install
 LDADD = ../../lib/libgnutls.la ../../gl/libgnu.la ../libutils.la