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 378d2ca..cdc6144 100644 (file)
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,5 +1,10 @@
 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.
        (cc1objplus-checksum.o, objcp/objcp-lang.o, objcp/objcp-decl.o,
        objcp/objcp-act.o): Remove.

diff --git a/gcc/objcp/Make-lang.in b/gcc/objcp/Make-lang.in
index b2e64f9..77e1451 100644 (file)
--- 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:
 
 #\f