aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Kenner <kenner@vlsi1.ultra.nyu.edu>2000-09-14 16:49:11 +0000
committerRichard Kenner <kenner@gcc.gnu.org>2000-09-14 12:49:11 -0400
commit9985f21020181f2b6193682334b9e15c8583974c (patch)
tree2fd03af078e7144490e8db80ed0b44fccaa266c0 /gcc
parentb2ee8ec26572c30952814fe3ccf46454e6ee65bf (diff)
downloadgcc-9985f21020181f2b6193682334b9e15c8583974c.zip
gcc-9985f21020181f2b6193682334b9e15c8583974c.tar.gz
gcc-9985f21020181f2b6193682334b9e15c8583974c.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/Makefile.in1
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/Make-lang.in5
4 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ffa9e03..ba92327 100644
--- 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 672635a..dd08a84 100644
--- 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 4a75cb66..1eecfdd 100644
--- 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 5b08fd3..2f391c1 100644
--- 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;; \