Changeset 02c8e54 in mod_gnutls for Makefile.in

Timestamp:

Nov 22, 2015, 1:43:48 PM (5 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, upstream

Children:

63468af, 8a264b0, bcbcf5d

Parents:

89f863f (diff), 07cc51f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Imported Upstream version 0.7.2

File:

• Makefile.in (modified) (12 diffs)

Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
@@ -15 +15 @@
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
@@ -80 +90 @@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-        $(top_srcdir)/configure $(am__configure_deps) \
-        $(srcdir)/config.in $(top_srcdir)/include/mod_gnutls.h.in \
-        README config/compile config/config.guess config/config.sub \
-        config/depcomp config/install-sh config/missing \
-        config/ltmain.sh $(top_srcdir)/config/compile \
-        $(top_srcdir)/config/config.guess \
-        $(top_srcdir)/config/config.sub \
-        $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-        $(top_srcdir)/config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/apache.m4 \
@@ -99 +99 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+        $(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
@@ -162 +164 @@
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.in \
+        $(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
+        $(top_srcdir)/config/config.sub \
+        $(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
+        $(top_srcdir)/config/missing \
+        $(top_srcdir)/include/mod_gnutls.h.in README config/compile \
+        config/config.guess config/config.sub config/depcomp \
+        config/install-sh config/ltmain.sh config/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -216 +226 @@
 APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
 APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
+APR_UTIL_CONF = @APR_UTIL_CONF@
 APU_INCLUDES = @APU_INCLUDES@
 APU_LDFLAGS = @APU_LDFLAGS@
@@ -392 +403 @@
         $(am__cd) $(top_srcdir) && \
           $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
         @case '$?' in \
@@ -624 +634 @@
 
 dist-tarZ: distdir
-        @echo WARNING: "Support for shar distribution archives is" \
-                       "deprecated." >&2
+        @echo WARNING: "Support for distribution archives compressed with" \
+                       "legacy program 'compress' is deprecated." >&2
         @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
         tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
@@ -631 +641 @@
 
 dist-shar: distdir
-        @echo WARNING: "Support for distribution archives compressed with" \
-                       "legacy program 'compress' is deprecated." >&2
+        @echo WARNING: "Support for shar distribution archives is" \
+                       "deprecated." >&2
         @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
         shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
@@ -668 +678 @@
         chmod -R a-w $(distdir)
         chmod u+w $(distdir)
-        mkdir $(distdir)/_build $(distdir)/_inst
+        mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
         chmod a-w $(distdir)
         test -d $(distdir)/_build || exit 0; \
@@ -674 +684 @@
           && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
           && am__cwd=`pwd` \
-          && $(am__cd) $(distdir)/_build \
-          && ../configure \
+          && $(am__cd) $(distdir)/_build/sub \
+          && ../../configure \
             $(AM_DISTCHECK_CONFIGURE_FLAGS) \
             $(DISTCHECK_CONFIGURE_FLAGS) \
-            --srcdir=.. --prefix="$$dc_install_base" \
+            --srcdir=../.. --prefix="$$dc_install_base" \
           && $(MAKE) $(AM_MAKEFLAGS) \
           && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -855 +865 @@
         uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.