diff options
Diffstat (limited to 'gnu/usr.bin/gcc')
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/cp/Make-lang.in | 30 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/gcc/f/Make-lang.in | 15 |
2 files changed, 23 insertions, 22 deletions
diff --git a/gnu/usr.bin/gcc/gcc/cp/Make-lang.in b/gnu/usr.bin/gcc/gcc/cp/Make-lang.in index afeb7aba4f8..d683d45d9b6 100644 --- a/gnu/usr.bin/gcc/gcc/cp/Make-lang.in +++ b/gnu/usr.bin/gcc/gcc/cp/Make-lang.in @@ -63,7 +63,7 @@ g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) $(GCC_H) $(CONFIG_H) $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \ $(INCLUDES) $(srcdir)/cp/g++spec.c) -po-generated: $(srcdir)/cp/parse.c +po-generated: cp/parse.c # Create the compiler driver for g++. GXX_OBJS = gcc.o g++spec.o intl.o prefix.o version.o @@ -97,15 +97,15 @@ cc1plus$(exeext): $(CXX_OBJS) $(CXX_C_OBJS) $(BACKEND) \ $(CXX_OBJS) $(CXX_C_OBJS) $(BACKEND) libcpp.a $(LIBS) # Special build rules. -$(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf - gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \ - $(srcdir)/cp/cfns.gperf > $(srcdir)/cp/cfns.h +#$(srcdir)/cp/cfns.h: $(srcdir)/cp/cfns.gperf +# gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' \ +# $(srcdir)/cp/cfns.gperf > $(srcdir)/cp/cfns.h -$(srcdir)/cp/parse.h: $(srcdir)/cp/parse.c -$(srcdir)/cp/parse.c: $(srcdir)/cp/parse.y +cp/parse.h: cp/parse.c +cp/parse.c: cp/parse.y @echo "Expect 33 shift/reduce conflicts and 58 reduce/reduce conflicts." - cd $(srcdir)/cp && \ - if $(BISON) $(BISONFLAGS) -d -o p$$$$.c parse.y; then \ + cd cp && \ + if $(BISON) $(BISONFLAGS) -d -o p$$$$.c $(srcdir)/cp/parse.y; then \ grep '^#define[ ]*YYEMPTY' p$$$$.c >> p$$$$.h ; \ test -f p$$$$.output && mv -f p$$$$.output parse.output ; \ mv -f p$$$$.c parse.c ; mv -f p$$$$.h parse.h ; \ @@ -204,10 +204,10 @@ c++.mostlyclean: c++.clean: c++.distclean: -rm -f cp/config.status cp/Makefile - -rm -f $(srcdir)/cp/parse.output + -rm -f cp/parse.output c++.extraclean: c++.maintainer-clean: - -rm -f $(srcdir)/cp/parse.c $(srcdir)/cp/parse.h + -rm -f cp/parse.c cp/parse.h # # Stage hooks: # The main makefile has already created stage?/cp. @@ -225,11 +225,11 @@ c++.stage4: stage4-start # .o: .h dependencies. CXX_TREE_H = $(TREE_H) cp/cp-tree.h c-common.h cp/cp-tree.def c-common.def \ function.h varray.h $(SYSTEM_H) $(CONFIG_H) $(TARGET_H) \ - $(srcdir)/../include/hashtab.h $(srcdir)/../include/splay-tree.h + $(LIBIBERTY_INCLUDES)/hashtab.h $(LIBIBERTY_INCLUDES)/splay-tree.h -cp/spew.o: cp/spew.c $(CXX_TREE_H) $(srcdir)/cp/parse.h flags.h cp/lex.h \ +cp/spew.o: cp/spew.c $(CXX_TREE_H) cp/parse.h flags.h cp/lex.h \ toplev.h gt-cp-spew.h -cp/lex.o: cp/lex.c $(CXX_TREE_H) $(srcdir)/cp/parse.h flags.h cp/lex.h \ +cp/lex.o: cp/lex.c $(CXX_TREE_H) cp/parse.h flags.h cp/lex.h \ c-pragma.h toplev.h output.h mbchar.h $(GGC_H) input.h diagnostic.h \ cp/operators.def $(TM_P_H) cp/cp-lang.o: cp/cp-lang.c $(CXX_TREE_H) toplev.h langhooks.h $(LANGHOOKS_DEF_H) \ @@ -263,7 +263,7 @@ cp/except.o: cp/except.c $(CXX_TREE_H) flags.h $(RTL_H) except.h toplev.h \ cp/cfns.h $(EXPR_H) libfuncs.h tree-inline.h cp/expr.o: cp/expr.c $(CXX_TREE_H) $(RTL_H) flags.h $(EXPR_H) toplev.h \ except.h $(TM_P_H) -cp/pt.o: cp/pt.c $(CXX_TREE_H) cp/decl.h $(srcdir)/cp/parse.h cp/lex.h \ +cp/pt.o: cp/pt.c $(CXX_TREE_H) cp/decl.h cp/parse.h cp/lex.h \ toplev.h $(GGC_H) $(RTL_H) except.h tree-inline.h gt-cp-pt.h cp/error.o: cp/error.c $(CXX_TREE_H) toplev.h diagnostic.h flags.h real.h \ $(LANGHOOKS_DEF_H) @@ -280,7 +280,7 @@ cp/mangle.o: cp/mangle.c $(CXX_TREE_H) toplev.h real.h gt-cp-mangle.h $(TM_P_H) cp/parse.o: cp/parse.c $(CXX_TREE_H) flags.h cp/lex.h except.h output.h \ cp/decl.h $(SYSTEM_H) toplev.h $(GGC_H) gt-cp-parse.h $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \ - $(srcdir)/cp/parse.c $(OUTPUT_OPTION) + cp/parse.c $(OUTPUT_OPTION) # # These exist for maintenance purposes. diff --git a/gnu/usr.bin/gcc/gcc/f/Make-lang.in b/gnu/usr.bin/gcc/gcc/f/Make-lang.in index 1286f07e6d4..270b19481c5 100644 --- a/gnu/usr.bin/gcc/gcc/f/Make-lang.in +++ b/gnu/usr.bin/gcc/gcc/f/Make-lang.in @@ -143,12 +143,12 @@ f77.all.cross: g77-cross$(exeext) f77.start.encap: g77$(exeext) f77.rest.encap: -f77.info: $(srcdir)/f/g77.info +f77.info: f/g77.info f77.dvi: f/g77.dvi f77.generated-manpages: $(srcdir)/f/g77.1 # g77 documentation. -$(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ +f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ $(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \ $(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \ $(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \ @@ -156,8 +156,9 @@ $(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ $(srcdir)/doc/include/funding.texi \ $(srcdir)/doc/include/gcc-common.texi if [ x$(BUILD_INFO) = xinfo ]; then \ - rm -f $(srcdir)/f/g77.info-*; \ - cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o g77.info g77.texi; \ + rm -f f/g77.info-*; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + cd f && $(MAKEINFO) -I$$s/doc/include -I$$s/f -o g77.info $$s/f/g77.texi; \ else true; fi f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ @@ -268,15 +269,15 @@ f77.install-common: installdirs # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # to do the install. The sed rule was copied from stmp-int-hdrs. f77.install-info: f77.info installdirs - if [ -f $(srcdir)/f/g77.info ] ; then \ + if [ -f f/g77.info ] ; then \ rm -f $(DESTDIR)$(infodir)/g77.info*; \ - for f in $(srcdir)/f/g77.info*; do \ + for f in f/g77.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ done; \ chmod a-x $(DESTDIR)$(infodir)/g77.info*; \ else true; fi - @if [ -f $(srcdir)/f/g77.info ] ; then \ + @if [ -f f/g77.info ] ; then \ if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \ |