* depend2.am (@EXT@.o): Look for the source file in srcdir as well

	as the current directory.
	(@EXT@.lo): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4e3e9d2b856f8b4317b0ce5a3d64aca0b71aa609..6c39662a6499e66f35395270d9ee5689cbf226c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-19  Gordon Matzigkeit  <gord@fig.org>
+
+       * 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  <okuji@kuicr.kyoto-u.ac.jp>
 
        * automake.in (handle_data): Pass -candist instead of

diff --git a/depend2.am b/depend2.am
index f73ddb52354fee70758d4c2596cd05283080d85a..8d2919c01e69fdaeec0c71976f0531ec337a99d0 100644 (file)
--- 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 f73ddb52354fee70758d4c2596cd05283080d85a..8d2919c01e69fdaeec0c71976f0531ec337a99d0 100644 (file)
--- 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@