diff options
author | Per Bothner <per@bothner.com> | 1992-01-29 07:52:01 +0000 |
---|---|---|
committer | Per Bothner <per@bothner.com> | 1992-01-29 07:52:01 +0000 |
commit | 4cc027e126e19853730d7bfefac948e4ff8bdc91 (patch) | |
tree | 0229b3453446868054c3738877aadb588012b429 /Makefile.in | |
parent | cc35cb05cef68f27ec282855b2790bac51ed0b61 (diff) | |
download | gdb-4cc027e126e19853730d7bfefac948e4ff8bdc91.zip gdb-4cc027e126e19853730d7bfefac948e4ff8bdc91.tar.gz gdb-4cc027e126e19853730d7bfefac948e4ff8bdc91.tar.bz2 |
* Makefile.in: For libg++, make sure the -I pointing
to the gcc directory goes *after* all the libg++-local -I flags.
Also, move just-gcc dependency from just-libg++ to all-libg++.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index a3075ee..8b69148 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1233,6 +1233,8 @@ install-cvs: install-rcs install-gdbm force if [ -d $(unsubdir)/cvs ] ; then \ (cd $(unsubdir)/cvs$(subdir); \ $(MAKE) \ + "bindir=$(bindir)" \ + "mandir=$(man1dir)" \ "against=$(against)" \ "AR=$(AR)" \ "AR_FLAGS=$(AR_FLAGS)" \ @@ -1486,13 +1488,15 @@ install-fileutils: force ### libg++ .PHONY: all-libg++ just-libg++ -all-libg++: just-libg++ -# NOTE! We have added GXX= to the $(MAKE) line!!! Do not clone this one. -just-libg++: just-gcc force +all-libg++: just-gcc just-libg++ +# NOTE! We have added GXX= and XTRAFLAGS to the $(MAKE) line!!! +# Do not clone this one. +just-libg++: force if [ -d $(unsubdir)/libg++ ] ; then \ (cd $(unsubdir)/libg++$(subdir); \ $(MAKE) \ - GXX=`cd $(unsubdir)/..$(subdir); pwd`"/gcc/gcc -B"`cd $(unsubdir)/..$(subdir);pwd`"/gcc/ -I"`cd $(unsubdir)/..$(subdir); pwd`/gcc/include \ + GXX=`cd $(unsubdir)/..$(subdir); pwd`"/gcc/gcc -B"`cd $(unsubdir)/..$(subdir);pwd`"/gcc/" \ + "XTRAFLAGS=-I"`cd $(unsubdir)/..$(subdir); pwd`/gcc/include\ "prefix=$(prefix)" \ "datadir=$(datadir)" \ "mandir=$(mandir)" \ @@ -1744,6 +1748,12 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex # Take out glob from buildable dirs rm proto-toplev/Makefile.in sed '/^SUBDIRS =/s/glob //' <Makefile.in >proto-toplev/Makefile.in + # Take out texinfo from buildable dirs + cp proto-toplev/Makefile.in temp.$$ + sed '/^all\.normal: /s/all-texinfo //' <temp.$$ >temp1.$$ + sed '/^clean: /s/clean-texinfo //' <temp1.$$ >temp.$$ + sed '/^install\.all: /s/install-texinfo //' <temp.$$ >proto-toplev/Makefile.in + rm temp.$$ temp1.$$ mkdir proto-toplev/texinfo mkdir proto-toplev/texinfo/fsf ln -s ../../../texinfo/fsf/texinfo.tex proto-toplev/texinfo/fsf/ |