diff options
Diffstat (limited to 'gcc/cp/Makefile.in')
| -rw-r--r-- | gcc/cp/Makefile.in | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index d9e32402d39..ef81437d2ae 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU C++ compiler. -# Copyright (C) 1987, 88, 90-5, 1998 Free Software Foundation, Inc. +# Copyright (C) 1987, 88, 90-5, 1998, 1999 Free Software Foundation, Inc. #This file is part of GNU CC. @@ -105,6 +105,12 @@ VPATH = @srcdir@ # Additional system libraries to link with. CLIB= + +# Top build directory, relative to here. +top_builddir = .. + +# Internationalization library. +INTLLIBS = @INTLLIBS@ # Change this to a null string if obstacks are installed in the # system library. @@ -154,7 +160,8 @@ SUBDIR_MALLOC = `if [ x$(MALLOC) != x ]; then echo ../$(MALLOC); else true; fi` # How to link with both our special library facilities # and the system's installed libraries. -LIBS = $(SUBDIR_OBSTACK) $(SUBDIR_USE_ALLOCA) $(SUBDIR_MALLOC) $(CLIB) +LIBS = $(SUBDIR_OBSTACK) $(SUBDIR_USE_ALLOCA) $(SUBDIR_MALLOC) \ + $(INTLLIBS) $(CLIB) # Specify the directories to be searched for header files. # Both . and srcdir are used, in that order, @@ -188,9 +195,8 @@ OBJS = `cat ../stamp-objlist` ../c-common.o ../c-pragma.o OBJDEPS = ../stamp-objlist ../c-common.o ../c-pragma.o compiler: ../cc1plus$(exeext) -../cc1plus$(exeext): $(P) $(CXX_OBJS) $(OBJDEPS) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \ - $(CXX_OBJS) $(OBJS) $(LIBS) +../cc1plus$(exeext): $(P) $(OBJDEPS) $(CXX_OBJS) $(LIBDEPS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(CXX_OBJS) $(LIBS) Makefile: $(srcdir)/Makefile.in $(srcdir)/../configure cd ..; $(SHELL) config.status @@ -219,7 +225,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \ `echo $(PARSE_C) | sed 's,^\./,,'` -CONFLICTS = expect 25 shift/reduce conflicts and 42 reduce/reduce conflicts. +CONFLICTS = expect 36 shift/reduce conflicts and 42 reduce/reduce conflicts. $(PARSE_H) : $(PARSE_C) $(PARSE_C) : $(srcdir)/parse.y @echo $(CONFLICTS) @@ -235,11 +241,10 @@ $(PARSE_C) : $(srcdir)/parse.y # cp $(PARSE_C) y.tab.c # touch stamp-parse -# hash.h really depends on $(srcdir)/gxx.gperf. -# But this would screw things for people that don't have gperf, -# if gxx.gpref got touched, say. -# Thus you have to remove hash.h to force it to be re-made. -$(srcdir)/hash.h: +# We used to try to protect people from having to rerun gperf. But, +# the C front-end already requires this if c-parse.gperf is changed, +# so we should be consistent. +$(srcdir)/hash.h: $(srcdir)/gxx.gperf gperf -L KR-C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word \ '-k1,4,7,$$' $(srcdir)/gxx.gperf >$(srcdir)/hash.h @@ -251,7 +256,8 @@ lex.o : lex.c $(CONFIG_H) $(CXX_TREE_H) \ $(srcdir)/../output.h $(srcdir)/../mbchar.h decl.o : decl.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ lex.h decl.h $(srcdir)/../stack.h $(srcdir)/../output.h \ - $(srcdir)/../except.h $(srcdir)/../system.h $(srcdir)/../toplev.h + $(srcdir)/../except.h $(srcdir)/../system.h $(srcdir)/../toplev.h \ + $(srcdir)/../hash.h decl2.o : decl2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ lex.h decl.h $(EXPR_H) $(srcdir)/../except.h \ $(srcdir)/../output.h $(srcdir)/../except.h $(srcdir)/../system.h \ @@ -270,9 +276,11 @@ init.o : init.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \ $(EXPR_H) $(srcdir)/../system.h $(srcdir)/../toplev.h method.o : method.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h \ $(srcdir)/../toplev.h -cvt.o : cvt.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h +cvt.o : cvt.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h decl.h \ + $(srcdir)/../flags.h $(srcdir)/../toplev.h $(srcdir)/../convert.h search.o : search.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../stack.h \ - $(srcdir)/../flags.h $(srcdir)/../system.h $(srcdir)/../toplev.h + $(srcdir)/../flags.h $(srcdir)/../system.h $(srcdir)/../toplev.h \ + $(srcdir)/../varray.h tree.o : tree.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \ $(srcdir)/../system.h $(srcdir)/../toplev.h ptree.o : ptree.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h |