[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [FYI] [ng] refactor: move hack for libtool installs from a
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [FYI] [ng] refactor: move hack for libtool installs from automake to install.am |
Date: |
Mon, 30 Jul 2012 17:06:24 +0200 |
* automake.in (generate_makefile): Move the hack necessary to make the
installation of libtool libraries and binaries dependent on them work
"on degenerate systems even with make -j" (according to the comments of
the original authors :-) from here ...
* lib/am/install.am: .. to here, with improved comments.
For the origin of the hack we are moving around here, refer to commit
bd4a1d5 of 2000-10-19, "* automake.in (handle_merge_targets): Allow
parallel install with forced relink".
Signed-off-by: Stefano Lattarini <address@hidden>
---
automake.in | 10 ----------
lib/am/install.am | 14 ++++++++++++++
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/automake.in b/automake.in
index 10d03ca..bbdd130 100644
--- a/automake.in
+++ b/automake.in
@@ -6895,16 +6895,6 @@ sub generate_makefile ($$)
# Special targets "all" and "check".
handle_all_and_check;
- # FIXME: Gross!
- if (var ('lib_LTLIBRARIES') && var ('bin_PROGRAMS'))
- {
- $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";
- }
-
almost_verbatim ('install');
handle_clean ($makefile);
handle_factored_dependencies;
diff --git a/lib/am/install.am b/lib/am/install.am
index 1972905..a87e172 100644
--- a/lib/am/install.am
+++ b/lib/am/install.am
@@ -94,3 +94,17 @@ install-strip:
INSTALL_STRIP_FLAG=-s \
$(if $(STRIP),"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'") \
install
+
+# Allow parallel install with forced relink. See commit Automake bd4a1d5
+# of 2000-10-19 for a little more background.
+# FIXME: this is gross, and is debatable how useful and/or needed this
+# workaround still is today. This is something that should be eventually
+# discussed with the Libtool guys.
+ifdef bin_PROGRAMS
+ ifdef lib_LTLIBRARIES
+ install-binPROGRAMS: install-libLTLIBRARIES
+ endif
+ ifdef nobase_lib_LTLIBRARIES
+ install-binPROGRAMS: install-nobase_libLTLIBRARIES
+ endif
+endif
--
1.7.12.rc0
- [Automake-NG] [FYI] [ng] refactor: move hack for libtool installs from automake to install.am,
Stefano Lattarini <=