automake-ng
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-NG] [PATCH 3/3] [ng] depcomp: remove unused variable '$source'


From: Stefano Lattarini
Subject: [Automake-NG] [PATCH 3/3] [ng] depcomp: remove unused variable '$source' from the depcomp script
Date: Fri, 8 Jun 2012 12:49:13 +0200

* lib/am/depend2.am (%.c -> %.$(OBJEXT) compilation recipes): Do not
pass the path of the source file in the 'source' environment variable
to the invocation of the 'depcomp' script.
* lib/depcomp: Don't document the 'source' environment variable, and
do not abort if it is not set; that variable wasn't actually used
anyway.

Signed-off-by: Stefano Lattarini <address@hidden>
---
 lib/am/depend2.am |    4 ++--
 lib/depcomp       |    5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 81d2c4c..fa8914f 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -56,7 +56,7 @@ if !%AMDEP%
        %SILENT%$(am__ensure_target_dir_exists)
 else %AMDEP%
        %SILENT%$(am__ensure_depdir)
-       %VERBOSE%source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+       %VERBOSE%object=$@ libtool=no @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 ?-o?   %VERBOSE-NODEP%%COMPILE% %-c% %-o% $@ %SOURCEFLAG%$(am__o_src)
@@ -78,7 +78,7 @@ if !%AMDEP%
        %SILENT%$(am__ensure_target_dir_exists)
 else %AMDEP%
        %SILENT%$(am__ensure_depdir)
-       %VERBOSE%source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+       %VERBOSE%object=$@ libtool=yes @AMDEPBACKSLASH@
        DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
 endif %AMDEP%
 ## We can always use '-o' with Libtool.
diff --git a/lib/depcomp b/lib/depcomp
index debb6ff..9d1b577 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -39,7 +39,6 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
   object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
@@ -62,8 +61,8 @@ tab=' '
 nl='
 '
 
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+if test -z "$depmode" || test -z "$object"; then
+  echo "depcomp: Variables object and depmode must be set" 1>&2
   exit 1
 fi
 
-- 
1.7.9.5




reply via email to

[Prev in Thread] Current Thread [Next in Thread]