Makefile.in (LN): Remove duplicate definition.

	* Makefile.in (LN): Remove duplicate definition.
	* cp/Make-lang.in (cplib2.txt): Depend on cp/Makefile.

From-SVN: r36411

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ffa9e03fa7ad17cd4fd81a312076320ba1e0918c..ba923270b5d9658df6861034e60a9acd681bc9fd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 14 12:10:16 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+       * Makefile.in (LN): Remove duplicate definition.
+
 2000-09-12  Bernd Schmidt  <bernds@redhat.co.uk>
 
        From Joern Rennecke:

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 672635a0519d5ebca4d26425f9db6ea09f5648e6..dd08a84997504e01cf4f41e63a97e90e302e2a9b 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -103,7 +103,6 @@ LEX = `if [ -f $(objdir)/../flex/flex ] ; then echo $(objdir)/../flex/flex ; els
 LEXFLAGS =
 AR = ar
 AR_FLAGS = rc
-LN = @symbolic_link@
 DLLTOOL = dlltool
 SHELL = /bin/sh
 # on sysV, define this as cp.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4a75cb66cee979a68281eb7775cc42d422106f6a..1eecfdd532359304fc6b1efafe069bbf1ef64e5e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 14 12:10:45 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+       * Make-lang.in (cplib2.txt): Depend on cp/Makefile.
+
 2000-09-13  J. David Anglin  <dave@hiauly1.hia.nrc.ca>
 
        * init.c (begin_init_stmts): Don't use // comments.

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 5b08fd381722bc8623995002dce27af87ac809cd..2f391c1349a22d40e27da62d3216029bce9f8b9b 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -179,8 +179,9 @@ vec.o: cc1plus$(exeext) $(srcdir)/cp/vec.cc
        $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(GXX_ABI_FLAG) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/vec.cc -o vec.o
 
-# We want to update cplib2.txt if any of the source files change...
-cplib2.txt: $(CXX_LIB2SRCS) $(CXX_EXTRA_HEADERS)
+# We want to update cplib2.txt if any of the source files change or if the
+# Makefile (which contains the list of sources) changes.
+cplib2.txt: $(CXX_LIB2SRCS) $(CXX_EXTRA_HEADERS) cp/Makefile
        case " $(LANGUAGES) " in \
        *" "[cC]"++ "*) \
          echo $(CXX_LIB2FUNCS) > cplib2.new;; \