[vlc-commits] Set directory-wide libtool tag correctly

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Nov  8 22:26:31 2012 +0200| [0b1cc788e1fd5066ab17cfafa3544c96f9e9b3d2] | committer: Rémi Denis-Courmont

Set directory-wide libtool tag correctly

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0b1cc788e1fd5066ab17cfafa3544c96f9e9b3d2
---

 modules/arm_neon/Modules.am                   |    4 +---
 modules/gui/macosx/Modules.am                 |    5 +----
 modules/gui/macosx_dialog_provider/Modules.am |    5 +----
 modules/gui/minimal_macosx/Modules.am         |    5 +----
 modules/notify/Modules.am                     |    5 +----
 modules/video_output/Modules.am               |    5 +----
 6 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/modules/arm_neon/Modules.am b/modules/arm_neon/Modules.am
index 4f2af9e..1e55d41 100644
--- a/modules/arm_neon/Modules.am
+++ b/modules/arm_neon/Modules.am
@@ -1,6 +1,4 @@
-# When using a specific AS tool instead of gcc libtool goes mad
-# without this. (This is the case with iOS).
-LIBTOOL=@LIBTOOL@ --tag=CC
+AM_LIBTOOLFLAGS=--tag=CC
 
 libaudio_format_neon_plugin_la_SOURCES = \
 	s32_s16.S \
diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am
index 7d766c7..98bf6e6 100644
--- a/modules/gui/macosx/Modules.am
+++ b/modules/gui/macosx/Modules.am
@@ -1,7 +1,4 @@
-# Automake forgets to add a proper tag to libtool with Objective-C files.
-# Moreovcer Libtool should default tag to CC when none is specified but
-# obviously does not. Here is a fix for that.
-LIBTOOL=@LIBTOOL@ --tag=CC
+AM_LIBTOOLFLAGS=--tag=CC
 
 SOURCES_macosx = \
 	CompatibilityFixes.h \
diff --git a/modules/gui/macosx_dialog_provider/Modules.am b/modules/gui/macosx_dialog_provider/Modules.am
index fc7e68a..07263c6 100644
--- a/modules/gui/macosx_dialog_provider/Modules.am
+++ b/modules/gui/macosx_dialog_provider/Modules.am
@@ -1,7 +1,4 @@
-# Automake forgets to add a proper tag to libtool with Objective-C files.
-# Moreocer Libtool should default tag to CC when none is specified but
-# obviously does not. Here is a fix for that.
-LIBTOOL=@LIBTOOL@ --tag=CC
+AM_LIBTOOLFLAGS=--tag=CC
 
 SOURCES_macosx_dialog_provider = \
     VLCLoginPanel.m \
diff --git a/modules/gui/minimal_macosx/Modules.am b/modules/gui/minimal_macosx/Modules.am
index cf3b0ec..6541f0a 100644
--- a/modules/gui/minimal_macosx/Modules.am
+++ b/modules/gui/minimal_macosx/Modules.am
@@ -1,7 +1,4 @@
-# Automake forgets to add a proper tag to libtool with Objective-C files.
-# Moreocer Libtool should default tag to CC when none is specified but
-# obviously does not. Here is a fix for that.
-LIBTOOL=@LIBTOOL@ --tag=CC
+AM_LIBTOOLFLAGS=--tag=CC
 
 SOURCES_minimal_macosx = \
 	intf.m \
diff --git a/modules/notify/Modules.am b/modules/notify/Modules.am
index 3dd67c6..0e32fda 100644
--- a/modules/notify/Modules.am
+++ b/modules/notify/Modules.am
@@ -1,7 +1,4 @@
-# Automake forgets to add a proper tag to libtool with Objective-C files.
-# Moreocer Libtool should default tag to CC when none is specified but
-# obviously does not. Here is a fix for that.
-LIBTOOL=@LIBTOOL@ --tag=CC
+AM_LIBTOOLFLAGS=--tag=CC
 
 SOURCES_growl = growl.m
 SOURCES_notify = notify.c
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 244c594..a5aa5e9 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -1,7 +1,4 @@
-# Automake forgets to add a proper tag to libtool with Objective-C files.
-# Moreocer Libtool should default tag to CC when none is specified but
-# obviously does not. Here is a fix for that.
-LIBTOOL=@LIBTOOL@ --tag=CC
+AM_LIBTOOLFLAGS=--tag=CC
 
 SOURCES_aa = aa.c
 SOURCES_fb = fb.c