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
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,
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 \
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 && \
# 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 \
# 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=
# 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
$(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
+++ /dev/null
-## 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
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
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
AC_CONFIG_FILES([ \
Makefile \
+ includes/Makefile
+ includes/gnutls/gnutls.h \
minitasn1/Makefile \
x509/Makefile \
openpgp/Makefile \
--- /dev/null
+## 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
# 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
# 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
# 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
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
AC_CONFIG_FILES([ \
Makefile \
+ includes/Makefile
gl/Makefile \
gnutls-extra.pc \
])
--- /dev/null
+## 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
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
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
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
+++ /dev/null
-## 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)
+++ /dev/null
-## 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
-
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
projects / thirdparty / gnutls.git / commitdiff
