[gawk-diffs] [SCM] gawk branch, master, updated. gawk-4.1.0-2442-gb39a138

[Andrew J. Schorr]

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 "gawk".

The branch, master has been updated
       via  b39a138b9e445073f5f70ece80fa8a5393b1ea50 (commit)
      from  50a83f464b8c573bf8053dbb503041f4640b68d2 (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 -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=b39a138b9e445073f5f70ece80fa8a5393b1ea50

commit b39a138b9e445073f5f70ece80fa8a5393b1ea50
Author: Andrew J. Schorr <address@hidden>
Date:   Tue Mar 7 09:00:46 2017 -0500

    Stop installing the extension testext library, since it is useful only for 
testing.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index 89be82d..f1622b6 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,15 @@
+2017-03-07         Andrew J. Schorr     <address@hidden>
+
+       * Makefile.am (pkgextension_LTLIBRARIES): Remove testext.la, since it
+       does not make sense to install this library.
+       (noinst_LTLIBRARIES): New variable containing list of libraries to
+       build for testing purposes only. These libraries will not be installed.
+       Initially, it contains only testext.la.
+       (testext_la_LDFLAGS): Add "-rpath /foo" to convince automake/libtool
+       to build a shared version of this library. Since it is not being
+       installed, automake cannot use the final destination directory to
+       determine -rpath by itself. The value doesn't matter.
+
 2017-01-21  Eli Zaretskii  <address@hidden>
 
        * testext.c (getuid) [__MINGW32__]: New function, mirrors what
diff --git a/extension/Makefile.am b/extension/Makefile.am
index 59c5cb8..185bc79 100644
--- a/extension/Makefile.am
+++ b/extension/Makefile.am
@@ -45,9 +45,11 @@ pkgextension_LTLIBRARIES =   \
        revoutput.la    \
        revtwoway.la    \
        rwarray.la      \
-       testext.la      \
        time.la
 
+noinst_LTLIBRARIES =   \
+       testext.la
+
 MY_MODULE_FLAGS = -module -avoid-version -no-undefined
 # on Cygwin, gettext requires that we link with -lintl 
 MY_LIBS = $(LTLIBINTL)
@@ -97,8 +99,11 @@ time_la_SOURCES       = time.c
 time_la_LDFLAGS       = $(MY_MODULE_FLAGS)
 time_la_LIBADD        = $(MY_LIBS)
 
+# N.B. Becaues we are not installing testext, we must specify -rpath in
+# LDFLAGS to get automake to build a shared library, since it needs
+# an installation path.
 testext_la_SOURCES    = testext.c
-testext_la_LDFLAGS    = $(MY_MODULE_FLAGS)
+testext_la_LDFLAGS    = $(MY_MODULE_FLAGS) -rpath /foo
 testext_la_LIBADD     = $(MY_LIBS)
 
 install-data-hook:
diff --git a/extension/Makefile.in b/extension/Makefile.in
index 23bb5cf..6557693 100644
--- a/extension/Makefile.in
+++ b/extension/Makefile.in
@@ -157,7 +157,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(pkgextensiondir)" \
        "$(DESTDIR)$(man3dir)"
-LTLIBRARIES = $(pkgextension_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkgextension_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 filefuncs_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_filefuncs_la_OBJECTS = filefuncs.lo stack.lo gawkfts.lo
@@ -517,9 +517,11 @@ pkgextension_LTLIBRARIES = \
        revoutput.la    \
        revtwoway.la    \
        rwarray.la      \
-       testext.la      \
        time.la
 
+noinst_LTLIBRARIES = \
+       testext.la
+
 MY_MODULE_FLAGS = -module -avoid-version -no-undefined
 # on Cygwin, gettext requires that we link with -lintl 
 MY_LIBS = $(LTLIBINTL)
@@ -558,8 +560,12 @@ rwarray_la_LIBADD = $(MY_LIBS)
 time_la_SOURCES = time.c
 time_la_LDFLAGS = $(MY_MODULE_FLAGS)
 time_la_LIBADD = $(MY_LIBS)
+
+# N.B. Becaues we are not installing testext, we must specify -rpath in
+# LDFLAGS to get automake to build a shared library, since it needs
+# an installation path.
 testext_la_SOURCES = testext.c
-testext_la_LDFLAGS = $(MY_MODULE_FLAGS)
+testext_la_LDFLAGS = $(MY_MODULE_FLAGS) -rpath /foo
 testext_la_LIBADD = $(MY_LIBS)
 EXTRA_DIST = build-aux/config.rpath  \
        ChangeLog \
@@ -632,6 +638,17 @@ $(srcdir)/configh.in:  $(am__configure_deps)
 distclean-hdr:
        -rm -f config.h stamp-h1
 
+clean-noinstLTLIBRARIES:
+       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+       @list='$(noinst_LTLIBRARIES)'; \
+       locs=`for p in $$list; do echo $$p; done | \
+             sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+             sort -u`; \
+       test -z "$$locs" || { \
+         echo rm -f $${locs}; \
+         rm -f $${locs}; \
+       }
+
 install-pkgextensionLTLIBRARIES: $(pkgextension_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        @list='$(pkgextension_LTLIBRARIES)'; test -n "$(pkgextensiondir)" || 
list=; \
@@ -698,7 +715,7 @@ rwarray.la: $(rwarray_la_OBJECTS) 
$(rwarray_la_DEPENDENCIES) $(EXTRA_rwarray_la_
        $(AM_V_CCLD)$(rwarray_la_LINK) -rpath $(pkgextensiondir) 
$(rwarray_la_OBJECTS) $(rwarray_la_LIBADD) $(LIBS)
 
 testext.la: $(testext_la_OBJECTS) $(testext_la_DEPENDENCIES) 
$(EXTRA_testext_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(testext_la_LINK) -rpath $(pkgextensiondir) 
$(testext_la_OBJECTS) $(testext_la_LIBADD) $(LIBS)
+       $(AM_V_CCLD)$(testext_la_LINK)  $(testext_la_OBJECTS) 
$(testext_la_LIBADD) $(LIBS)
 
 time.la: $(time_la_OBJECTS) $(time_la_DEPENDENCIES) 
$(EXTRA_time_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(time_la_LINK) -rpath $(pkgextensiondir) 
$(time_la_OBJECTS) $(time_la_LIBADD) $(LIBS)
@@ -1131,8 +1148,8 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool clean-pkgextensionLTLIBRARIES \
-       mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+       clean-pkgextensionLTLIBRARIES mostlyclean-am
 
 distclean: distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -1211,13 +1228,14 @@ uninstall-man: uninstall-man3
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
        am--refresh check check-am clean clean-cscope clean-generic \
-       clean-libtool clean-pkgextensionLTLIBRARIES cscope \
-       cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
-       dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-       distcheck distclean distclean-compile distclean-generic \
-       distclean-hdr distclean-libtool distclean-tags distcleancheck \
-       distdir distuninstallcheck dvi dvi-am html html-am info \
-       info-am install install-am install-data install-data-am \
+       clean-libtool clean-noinstLTLIBRARIES \
+       clean-pkgextensionLTLIBRARIES cscope cscopelist-am ctags \
+       ctags-am dist dist-all dist-bzip2 dist-gzip dist-lzip \
+       dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \
+       distclean-compile distclean-generic distclean-hdr \
+       distclean-libtool distclean-tags distcleancheck distdir \
+       distuninstallcheck dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am \
        install-data-hook install-dvi install-dvi-am install-exec \
        install-exec-am install-html install-html-am install-info \
        install-info-am install-man install-man3 install-pdf \

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

Summary of changes:
 extension/ChangeLog   | 12 ++++++++++++
 extension/Makefile.am |  9 +++++++--
 extension/Makefile.in | 44 +++++++++++++++++++++++++++++++-------------
 3 files changed, 50 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
gawk