[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-60-gf7a5b44

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=f7a5b448e2060905f408b1cfd6bd8797605b0293

The branch, master has been updated
       via  f7a5b448e2060905f408b1cfd6bd8797605b0293 (commit)
      from  94138b8e4fe7edf901bc239f9b5dbe14aea68dc6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f7a5b448e2060905f408b1cfd6bd8797605b0293
Author: Simon Josefsson <address@hidden>
Date:   Tue Jan 24 15:03:03 2012 +0100

    Fix make dist.

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am     |    8 +++++++-
 src/Makefile.am |    6 +-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 06fdb1d..ef072d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,13 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
 
-SUBDIRS = gl lib extra po src doc tests
+SUBDIRS = gl lib extra po
+
+if NEED_LIBOPTS
+SUBDIRS += $(LIBOPTS_DIR)
+endif
+
+SUBDIRS += src doc tests
 
 if HAVE_GUILE
 SUBDIRS += guile
diff --git a/src/Makefile.am b/src/Makefile.am
index e26a567..d364e8f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,12 +17,8 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-SUBDIRS =
 if ENABLE_CRYWRAP
-SUBDIRS += crywrap
-endif
-if NEED_LIBOPTS
-SUBDIRS += $(LIBOPTS_DIR)
+SUBDIRS = crywrap
 endif
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)


hooks/post-receive
-- 
GNU gnutls