diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-07 16:02:00 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-07 16:02:00 +0000 |
| commit | d723e6e5fe98e764094583033ba908d5f4b59826 (patch) | |
| tree | de7d4871a3ccaf3eb108a4344ba1ddb1d0b5a1c3 /libjava/Makefile.am | |
| parent | 5fb373c982c8be47d723403723e680430fbd0a83 (diff) | |
| download | ppe42-gcc-d723e6e5fe98e764094583033ba908d5f4b59826.tar.gz ppe42-gcc-d723e6e5fe98e764094583033ba908d5f4b59826.zip | |
* Makefile.in: Rebuilt.
* Makefile.am (LIBLINK): New macro.
(libgcj_la_LINK): Use it.
(libgcjawt_la_LINK): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33760 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 614f870f74b..d7b98c284fa 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -73,6 +73,7 @@ endif # CANADIAN GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -L$(here) $(JC1FLAGS) -c GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ +LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ JAVAC = $(GCJ) -C @@ -132,7 +133,8 @@ libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \ ## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` -libgcj_la_LINK = $(GCJLINK) +libgcj_la_LINK = $(LIBLINK) + libgcjawt_la_SOURCES = ## Nothing EXTRA_libgcjawt_la_SOURCES = $(awt_java_source_files) @@ -141,7 +143,7 @@ libgcjawt_la_LIBADD = $(awto_files) libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \ ## The mysterious backslash is consumed by make. -version-info `grep -v '^\#' $(srcdir)/libtool-version` -libgcjawt_la_LINK = $(GCJLINK) +libgcjawt_la_LINK = $(LIBLINK) ## Make the .class files depend on the .zip file. This seems ## backwards, but is right. This doesn't catch all the .class files, |
