diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2005-03-28 20:31:02 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@gcc.gnu.org> | 2005-03-28 20:31:02 +0000 |
| commit | 3162d93d24c85c5c2834169d9055962cc5ffe3ee (patch) | |
| tree | 279d819dbb1e9cb569c23b2cf365b118630a2a60 /libjava/external | |
| parent | b982b5f11cbf61457a04d5d5ef27fb4d139c1e70 (diff) | |
| download | gcc-3162d93d24c85c5c2834169d9055962cc5ffe3ee.zip gcc-3162d93d24c85c5c2834169d9055962cc5ffe3ee.tar.gz gcc-3162d93d24c85c5c2834169d9055962cc5ffe3ee.tar.bz2 | |
configure.ac: Revert 2005-03-25's patch.
* configure.ac: Revert 2005-03-25's patch. Propagate MULTIlib
settings to sub Makefiles.
(GCJH, ZIP): Prefix with top_builddir.
* configure: Rebuild.
* external/w3c_dom/Makefile.am (MULTIBUILDTOP): Don't override.
* external/w3c_dom/Makefile.in: Rebuild.
* external/sax/Makefile.am (MULTIBUILDTOP): Don't override.
* external/sax/Makefile.in: Rebuild.
From-SVN: r97139
Diffstat (limited to 'libjava/external')
| -rw-r--r-- | libjava/external/sax/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/external/sax/Makefile.in | 1 | ||||
| -rw-r--r-- | libjava/external/w3c_dom/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/external/w3c_dom/Makefile.in | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/libjava/external/sax/Makefile.am b/libjava/external/sax/Makefile.am index 65c3a28..6c7ac28 100644 --- a/libjava/external/sax/Makefile.am +++ b/libjava/external/sax/Makefile.am @@ -5,9 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -## Needed because $(ZIP) is a relative path. -MULTIBUILDTOP = ../../ - ## The compiler with whatever flags we want for both -c and -C ## compiles. GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) diff --git a/libjava/external/sax/Makefile.in b/libjava/external/sax/Makefile.in index 6834616..6ee3e5f 100644 --- a/libjava/external/sax/Makefile.in +++ b/libjava/external/sax/Makefile.in @@ -299,7 +299,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -MULTIBUILDTOP = ../../ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir) AM_GCJFLAGS = \ diff --git a/libjava/external/w3c_dom/Makefile.am b/libjava/external/w3c_dom/Makefile.am index 2c563de..9723509 100644 --- a/libjava/external/w3c_dom/Makefile.am +++ b/libjava/external/w3c_dom/Makefile.am @@ -5,9 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -## Needed because $(ZIP) is a relative path. -MULTIBUILDTOP = ../../ - ## The compiler with whatever flags we want for both -c and -C ## compiles. GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) diff --git a/libjava/external/w3c_dom/Makefile.in b/libjava/external/w3c_dom/Makefile.in index 5718e0b..934fd5f 100644 --- a/libjava/external/w3c_dom/Makefile.in +++ b/libjava/external/w3c_dom/Makefile.in @@ -299,7 +299,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) -MULTIBUILDTOP = ../../ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH) BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir) AM_GCJFLAGS = \ |