From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 20 Sep 2008 11:02:23 +0000 (+0200)
Subject: Install nobase_lib_LTLIBRARIES before bin_PROGRAMS.
X-Git-Tag: v1.10b~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5c37270089c23fdf55039c72d7874600d5725e1;p=thirdparty%2Fautomake.git

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 <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 364b3fd52..79cac905a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-09-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	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 54f68657b..796f17d83 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 999400806..1d1e65eb7 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