OSDN Git Service

* Make-lang.in (g++.o): Depend on prefix.h.
[pf3gnuchains/gcc-fork.git] / gcc / cp / Make-lang.in
index bf2b352..5516668 100644 (file)
@@ -87,31 +87,32 @@ 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 \
   -c g++.c
 
 # Create the compiler driver for g++.
-g++$(exeext): g++.o g++spec.o version.o choose-temp.o pexecute.o prefix.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
+g++$(exeext): g++.o g++spec.o version.o choose-temp.o pexecute.o prefix.o mkstemp.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
        $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ g++.o g++spec.o prefix.o \
-         version.o choose-temp.o pexecute.o $(EXTRA_GCC_OBJS) $(LIBS)
+         version.o choose-temp.o pexecute.o mkstemp.o $(EXTRA_GCC_OBJS) $(LIBS)
 
 # Create a version of the g++ driver which calls the cross-compiler.
 g++-cross$(exeext): g++$(exeext)
        -rm -f g++-cross$(exeext)
        cp g++$(exeext) g++-cross$(exeext)
 
-cxxmain.o: cplus-dem.c demangle.h
+cxxmain.o: $(srcdir)/../libiberty/cplus-dem.c $(DEMANGLE_H)
        rm -f cxxmain.c
-       $(LN_S) $(srcdir)/cplus-dem.c 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) $(LIBS) -o $@ \
-         cxxmain.o underscore.o getopt.o getopt1.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 \
  $(srcdir)/cp/except.c $(srcdir)/cp/input.c $(srcdir)/cp/pt.c \
@@ -125,12 +126,12 @@ CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/decl2.c \
  $(srcdir)/cp/repo.c $(srcdir)/cp/semantics.c
 
 cc1plus$(exeext): $(P) $(CXX_SRCS) $(LIBDEPS) stamp-objlist c-common.o c-pragma.o \
-       $(srcdir)/cp/cp-tree.h $(srcdir)/cp/cp-tree.def
+       $(srcdir)/cp/cp-tree.h $(srcdir)/cp/cp-tree.def hash.o
        cd cp; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) ../cc1plus$(exeext)
 #\f
 # Build hooks:
 
-c++.all.build: g++$(exeext) $(DEMANGLER_PROG)
+c++.all.build: g++$(exeext)
 c++.all.cross: g++-cross$(exeext) $(DEMANGLER_PROG)
 c++.start.encap: g++$(exeext)
 c++.rest.encap: $(DEMANGLER_PROG)
@@ -140,40 +141,40 @@ c++.dvi:
 
 # C++ language-support library pieces for libgcc.
 tinfo.o: cc1plus$(exeext) $(srcdir)/cp/tinfo.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/tinfo.cc
 tinfo2.o: cc1plus$(exeext) $(srcdir)/cp/tinfo2.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/tinfo2.cc
 exception.o: cc1plus$(exeext) $(srcdir)/cp/exception.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c -fexceptions $(srcdir)/cp/exception.cc
 new.o: cc1plus$(exeext) $(srcdir)/cp/new.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new.cc
 opnew.o: cc1plus$(exeext) $(srcdir)/cp/new1.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new1.cc -DL_op_new -o opnew.o
 opnewnt.o: cc1plus$(exeext) $(srcdir)/cp/new1.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new1.cc -DL_op_newnt -o opnewnt.o
 opvnew.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new2.cc -DL_op_vnew -o opvnew.o
 opvnewnt.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new2.cc -DL_op_vnewnt -o opvnewnt.o
 opdel.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new2.cc -DL_op_delete -o opdel.o
 opdelnt.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new2.cc -DL_op_delnt -o opdelnt.o
 opvdel.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new2.cc -DL_op_vdel -o opvdel.o
 opvdelnt.o: cc1plus$(exeext) $(srcdir)/cp/new2.cc
-       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) \
+       $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CXXFLAGS) $(INCLUDES) \
          -c $(srcdir)/cp/new2.cc -DL_op_vdelnt -o opvdelnt.o
 
 # We want to update cplib2.txt if any of the source files change...
@@ -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.