Remove includes/gnutls/Makefile.am.

Fix includes/Makefile.am to compensate.

diff --git a/configure.in b/configure.in
index 2d7a1900d37e44b2bc9069fe045863178f096ea8..893434f07ce9c19b76fb3cdac6a624c8f40b435b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -504,17 +504,17 @@ AC_CONFIG_COMMANDS([chmod-config],[[
  chmod +x libextra/libgnutls-extra-config
 ]],[[]])
 
-AC_CONFIG_FILES([Makefile src/Makefile libextra/Makefile lib/Makefile \
-       libextra/openpgp/Makefile libextra/opencdk/Makefile \
-       doc/reference/Makefile \
-       lib/libgnutls-config libextra/libgnutls-extra-config \
-       doc/Makefile src/x509/Makefile src/srp/Makefile src/openpgp/Makefile \
-       src/cfg/Makefile src/cfg/platon/Makefile src/cfg/platon/str/Makefile \
-       doc/scripts/Makefile lib/minitasn1/Makefile lib/x509/Makefile \
-       includes/Makefile includes/gnutls/Makefile doc/manpages/Makefile \
+AC_CONFIG_FILES([Makefile \
+       doc/Makefile doc/scripts/Makefile \
+       doc/manpages/Makefile doc/reference/Makefile \
        gl/Makefile nettle/Makefile nettle/tests/Makefile \
        crypto/Makefile tests/Makefile \
-       lib/gnutls.pc libextra/gnutls-extra.pc \
-       includes/gnutls/gnutls.h])
+       includes/Makefile includes/gnutls/gnutls.h \
+       lib/Makefile lib/minitasn1/Makefile lib/x509/Makefile \
+       libextra/Makefile libextra/openpgp/Makefile libextra/opencdk/Makefile \
+       src/Makefile src/x509/Makefile src/srp/Makefile src/openpgp/Makefile \
+       src/cfg/Makefile src/cfg/platon/Makefile src/cfg/platon/str/Makefile \
+       lib/libgnutls-config libextra/libgnutls-extra-config \
+       lib/gnutls.pc libextra/gnutls-extra.pc])
 
 AC_OUTPUT

diff --git a/includes/Makefile.am b/includes/Makefile.am
index 2697ccc98ab5aceb4c412ff58ee96a0e0957fa2c..a92cd19dedda7f346f12008eee490be0dc9716c7 100644 (file)
--- a/includes/Makefile.am
+++ b/includes/Makefile.am
@@ -19,11 +19,11 @@
 # along with GNUTLS; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-nobase_include_HEADERS = gnutls/extra.h gnutls/gnutls.h gnutls/x509.h  \
-       gnutls/pkcs12.h gnutls/compat.h gnutls/openpgp.h
+nobase_include_HEADERS = gnutls/extra.h gnutls/x509.h gnutls/pkcs12.h  \
+       gnutls/compat.h gnutls/openpgp.h
 
 if ENABLE_OPENSSL
 nobase_include_HEADERS += gnutls/openssl.h
 endif
 
-SUBDIRS = gnutls
+nobase_nodist_include_HEADERS = gnutls/gnutls.h

diff --git a/includes/gnutls/Makefile.am b/includes/gnutls/Makefile.am
deleted file mode 100644 (file)
index c62c7e8..0000000
--- a/includes/gnutls/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
-#
-# Author: Nikos Mavroyanopoulos
-#
-# This file is part of GNUTLS.
-#
-# GNUTLS 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 2 of the License, or (at
-# your option) any later version.
-#
-# GNUTLS 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; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-EXTRA_DIST = extra.h openssl.h x509.h pkcs12.h openpgp.h compat.h