* Make-lang.in (g++.o): Depend on prefix.h.

[pf3gnuchains/gcc-fork.git] / gcc / cp / Make-lang.in

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 20641a3..5516668 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -87,7 +87,7 @@ g++spec.o: $(srcdir)/cp/g++spec.c
 # to track changes to the toplevel gcc Makefile as well.
 # We depend on g++.c last, to make it obvious where it came from.
 g++.o: $(CONFIG_H) multilib.h config.status $(lang_specs_files) g++.c \
-       system.h
+       system.h prefix.h
        $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
        $(DRIVER_DEFINES) \
        -DLANG_SPECIFIC_DRIVER \
@@ -103,14 +103,15 @@ g++-cross$(exeext): g++$(exeext)
        -rm -f g++-cross$(exeext)
        cp g++$(exeext) g++-cross$(exeext)
 
-cxxmain.o: $(srcdir)/../libiberty/cplus-dem.c demangle.h
+cxxmain.o: $(srcdir)/../libiberty/cplus-dem.c $(DEMANGLE_H)
        rm -f cxxmain.c
        $(LN_S) $(srcdir)/../libiberty/cplus-dem.c cxxmain.c
        $(CC) -c -DMAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
          -DVERSION=\"$(version)\" cxxmain.c
 
+# Apparently OpenVM needs the -o to be at the beginning of the link line.
 $(DEMANGLER_PROG): cxxmain.o underscore.o getopt.o getopt1.o $(LIBDEPS)
-       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
+       $(CC) -o $@ $(ALL_CFLAGS) $(LDFLAGS) \
          cxxmain.o underscore.o getopt.o getopt1.o $(LIBS)
 
 CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/decl2.c \
@@ -246,13 +247,13 @@ c++.install-info:
 c++.install-man: $(srcdir)/cp/g++.1
        -if [ -f cc1plus$(exeext) ] ; then \
          if [ -f g++-cross$(exeext) ] ; then \
-           rm -f $(mandir)/$(GXX_CROSS_NAME)$(manext); \
-           $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/$(GXX_CROSS_NAME)$(manext); \
-           chmod a-x $(mandir)/$(GXX_CROSS_NAME)$(manext); \
+           rm -f $(man1dir)/$(GXX_CROSS_NAME)$(manext); \
+           $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_CROSS_NAME)$(manext); \
+           chmod a-x $(man1dir)/$(GXX_CROSS_NAME)$(manext); \
          else \
-           rm -f $(mandir)/$(GXX_INSTALL_NAME)$(manext); \
-           $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/$(GXX_INSTALL_NAME)$(manext); \
-           chmod a-x $(mandir)/$(GXX_INSTALL_NAME)$(manext); \
+           rm -f $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \
+           $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \
+           chmod a-x $(man1dir)/$(GXX_INSTALL_NAME)$(manext); \
          fi; \
        else true; fi
 
@@ -263,8 +264,8 @@ c++.uninstall:
        -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext)
        -rm -rf $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext)
        -rm -rf $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext)
-       -rm -rf $(mandir)/$(GXX_INSTALL_NAME)$(manext)
-       -rm -rf $(mandir)/$(GXX_CROSS_NAME)$(manext)
+       -rm -rf $(man1dir)/$(GXX_INSTALL_NAME)$(manext)
+       -rm -rf $(man1dir)/$(GXX_CROSS_NAME)$(manext)
 #\f
 # Clean hooks:
 # A lot of the ancillary files are deleted by the main makefile.