[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-184-ge5c3727

[Ralf Wildenhues]

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

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e5c37270089c23fdf55039c72d7874600d5725e1

The branch, master has been updated
       via  e5c37270089c23fdf55039c72d7874600d5725e1 (commit)
      from  e8ec58ac1815722b8c311ad2cc629e54e593019c (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 e5c37270089c23fdf55039c72d7874600d5725e1
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Sep 20 13:02:23 2008 +0200

    Install nobase_lib_LTLIBRARIES before bin_PROGRAMS.
    
    * automake.in (generate_makefile): If nobase_lib_LTLIBRARIES are
    used, add an ugly hack to install them before bin_PROGRAMS, just
    like done with lib_LTLIBRARIES.
    * tests/ltorder.test: Add program, to expose this.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog          |    6 ++++++
 automake.in        |    4 ++++
 tests/ltorder.test |    3 +++
 3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 364b3fd..79cac90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-09-20  Ralf Wildenhues  <address@hidden>
 
+       Install nobase_lib_LTLIBRARIES before bin_PROGRAMS.
+       * automake.in (generate_makefile): If nobase_lib_LTLIBRARIES are
+       used, add an ugly hack to install them before bin_PROGRAMS, just
+       like done with lib_LTLIBRARIES.
+       * tests/ltorder.test: Add program, to expose this.
+
        Do not reorder nobase ltlib installation.
        This patch changes back the order of installation of nobase
        LTLIBRARIES to that in which files are listed in the variables.
diff --git a/automake.in b/automake.in
index 54f6865..796f17d 100755
--- a/automake.in
+++ b/automake.in
@@ -7680,6 +7680,10 @@ sub generate_makefile ($$)
     {
       $output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n";
     }
+  if (var ('nobase_lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
+    {
+      $output_rules .= "install-binPROGRAMS: 
install-nobase_libLTLIBRARIES\n\n";
+    }
 
   handle_install;
   handle_clean ($makefile);
diff --git a/tests/ltorder.test b/tests/ltorder.test
index 9994008..1d1e65e 100755
--- a/tests/ltorder.test
+++ b/tests/ltorder.test
@@ -33,6 +33,8 @@ sub_liba2_la_LIBADD = liba1.la
 sub_liba3_la_LIBADD = sub/liba2.la
 liba4_la_LIBADD = sub/liba3.la
 liba5_la_LIBADD = liba4.la
+bin_PROGRAMS = p
+p_LDADD = liba5.la
 END
 
 mkdir sub
@@ -41,6 +43,7 @@ echo 'extern int a1 (); int a2 () { return a1 (); }' 
>sub/liba2.c
 echo 'extern int a2 (); int a3 () { return a2 (); }' >sub/liba3.c
 echo 'extern int a3 (); int a4 () { return a3 (); }' >liba4.c
 echo 'extern int a4 (); int a5 () { return a4 (); }' >liba5.c
+echo 'extern int a5 (); int main () { return a5 (); }' >p.c
 
 libtoolize
 $ACLOCAL


hooks/post-receive
--
GNU Automake