From: Tom Tromey <tromey@redhat.com>
Date: Tue, 25 Mar 2008 20:52:41 +0000 (+0000)
Subject: Make-lang.in (obj-c++_OBJS): Rename from objcp_OBJS.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1f447a83810015b05c90037fffbd831662a9db5;p=gcc.git

Make-lang.in (obj-c++_OBJS): Rename from objcp_OBJS.

	* Make-lang.in (obj-c++_OBJS): Rename from objcp_OBJS.
	(objcp/objcp-act.o): Restore target.

From-SVN: r133532
---

diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index 378d2ca5f52..cdc6144d616 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-25  Tom Tromey  <tromey@redhat.com>
+
+	* Make-lang.in (obj-c++_OBJS): Rename from objcp_OBJS.
+	(objcp/objcp-act.o): Restore target.
+
 2008-03-25  Tom Tromey  <tromey@redhat.com>
 
 	* Make-lang.in (objcp_OBJS): New variable.
diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in
index b2e64f9ed4f..77e14516298 100644
--- a/gcc/objcp/Make-lang.in
+++ b/gcc/objcp/Make-lang.in
@@ -51,7 +51,7 @@ objcp-warn = $(STRICT_WARN) -DOBJCPLUS -I$(srcdir)/objc -I$(srcdir)/cp
 OBJCXX_OBJS = objcp/objcp-act.o objcp/objcp-lang.o objcp/objcp-decl.o \
    $(CXX_AND_OBJCXX_OBJS)
 
-objcp_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o
+obj-c++_OBJS = $(OBJCXX_OBJS) cc1objplus-checksum.o
 
 cc1objplus-dummy$(exeext): $(OBJCXX_OBJS) dummy-checksum.o $(BACKEND) \
 		$(LIBDEPS)
@@ -65,6 +65,10 @@ cc1objplus$(exeext): $(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
 		$(OBJCXX_OBJS) cc1objplus-checksum.o $(BACKEND) $(LIBS) $(GMPLIBS)
 
+# Note that the source file is in a different directory.
+objcp/objcp-act.o: objc/objc-act.c
+	$(COMPILE) $<
+
 po-generated:
 
 #