diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-16 21:04:58 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-16 21:04:58 +0000 |
| commit | 88a09153515cca1388a7284174c5ff5ae4b93cb0 (patch) | |
| tree | 27111cd63e23f79a51befc8a5168955de5f5650c /libjava/Makefile.in | |
| parent | 8e7912a531869136f2b5796884c49cc0a7d578d2 (diff) | |
| download | gcc-88a09153515cca1388a7284174c5ff5ae4b93cb0.tar.gz | |
* Makefile.am: Set ZIP and GCJH directly using autoconf.
* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
gcj/Makefile.in: Regenerate.
* configure.in: Set ZIP and GCJH. Remove redundant condition
in AM_CONDITIONAL(NATIVE,...)
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84832 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index a835fbd3879..0505da13e34 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -196,12 +196,9 @@ propdir = $(libdir) @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry bin_SCRIPTS = addr2name.awk -@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar -@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar -@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar -@CANADIAN_TRUE@@NULL_TARGET_TRUE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_TRUE@gcjh -@CANADIAN_TRUE@@NULL_TARGET_FALSE@GCJH = @CANADIAN_TRUE@@NULL_TARGET_FALSE@$(target_noncanonical)-gcjh -@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh + +GCJH = @GCJH@ +ZIP = @ZIP@ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated @@ -3075,7 +3072,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA) DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ -THANKS acinclude.m4 aclocal.m4 configure configure.in \ +THANKS TODO acinclude.m4 aclocal.m4 configure configure.in \ libgcj-test.spec.in libgcj.pc.in libgcj.spec.in |