Commit 89b6698a by Tom Tromey Committed by Tom Tromey

Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (LIBLINK): New macro.
	(libgcj_la_LINK): Use it.
	(libgcjawt_la_LINK): Likewise.

From-SVN: r33760
parent 9ad3ca34
2000-05-07 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt.
* Makefile.am (LIBLINK): New macro.
(libgcj_la_LINK): Use it.
(libgcjawt_la_LINK): Likewise.
2000-05-06 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt.
......
......@@ -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,
......
......@@ -159,6 +159,7 @@ data_DATA = libgcj.zip
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
......@@ -208,7 +209,7 @@ libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
-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)
......@@ -217,7 +218,7 @@ libgcjawt_la_LIBADD = $(awto_files)
libgcjawt_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcjawt_la_LINK = $(GCJLINK)
libgcjawt_la_LINK = $(LIBLINK)
MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) \
$(awto_files)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment