From dd16cf3641508379a977c37b25fbbae93358bc40 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 19 Mar 2000 23:43:57 +0000 Subject: [PATCH] * depend2.am (@EXT@.o): Look for the source file in srcdir as well as the current directory. (@EXT@.lo): Likewise. --- ChangeLog | 6 ++++++ depend2.am | 6 +++--- lib/am/depend2.am | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e3e9d2..6c39662 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-03-19 Gordon Matzigkeit + + * depend2.am (@EXT@.o): Look for the source file in srcdir as well + as the current directory. + (@EXT@.lo): Likewise. + 2000-03-19 OKUJI Yoshinori * automake.in (handle_data): Pass -candist instead of diff --git a/depend2.am b/depend2.am index f73ddb5..8d2919c 100644 --- a/depend2.am +++ b/depend2.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-1998, 1999 Free Software Foundation, Inc. +## Copyright (C) 1994-1998, 1999, 2000 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -21,13 +21,13 @@ @AMDEP@ source='@SOURCE@' object='@OBJ@' libtool=no @AMDEPBACKSLASH@ @AMDEP@ depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@ @AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(@PFX@COMPILE) -c -o @OBJ@ @SOURCE@ + $(@PFX@COMPILE) -c -o @OBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ LIBTOOL@EXT@.lo: LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@ LIBTOOL@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@ LIBTOOL@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ -LIBTOOL $(LT@PFX@COMPILE) -c -o @LTOBJ@ @SOURCE@ +LIBTOOL $(LT@PFX@COMPILE) -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ OBJEXT@EXT@.obj: OBJEXT@AMDEP@ source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@ diff --git a/lib/am/depend2.am b/lib/am/depend2.am index f73ddb5..8d2919c 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-1998, 1999 Free Software Foundation, Inc. +## Copyright (C) 1994-1998, 1999, 2000 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -21,13 +21,13 @@ @AMDEP@ source='@SOURCE@' object='@OBJ@' libtool=no @AMDEPBACKSLASH@ @AMDEP@ depfile='$(DEPDIR)/@BASE@.Po' tmpdepfile='$(DEPDIR)/@BASE@.TPo' @AMDEPBACKSLASH@ @AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(@PFX@COMPILE) -c -o @OBJ@ @SOURCE@ + $(@PFX@COMPILE) -c -o @OBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ LIBTOOL@EXT@.lo: LIBTOOL@AMDEP@ source='@SOURCE@' object='@LTOBJ@' libtool=yes @AMDEPBACKSLASH@ LIBTOOL@AMDEP@ depfile='$(DEPDIR)/@BASE@.Plo' tmpdepfile='$(DEPDIR)/@BASE@.TPlo' @AMDEPBACKSLASH@ LIBTOOL@AMDEP@ $(@FPFX@DEPMODE) $(depcomp) @AMDEPBACKSLASH@ -LIBTOOL $(LT@PFX@COMPILE) -c -o @LTOBJ@ @SOURCE@ +LIBTOOL $(LT@PFX@COMPILE) -c -o @LTOBJ@ `test -f @SOURCE@ || echo '$(srcdir)/'`@SOURCE@ OBJEXT@EXT@.obj: OBJEXT@AMDEP@ source='@SOURCE@' object='@OBJOBJ@' libtool=no @AMDEPBACKSLASH@ -- 2.7.4