Patch: another crummy Makefile fix

Tom Tromey tromey@cygnus.com
Sun May 7 09:01:00 GMT 2000


Mo pointed out to me that my recent Makefile fixes still hadn't fully
fixed the problem.  For some reason, I didn't see the problem
yesterday, but I see it today.  So here's one more patch.

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.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.63
diff -u -r1.63 Makefile.am
--- Makefile.am	2000/05/06 16:25:13	1.63
+++ Makefile.am	2000/05/07 16:00:46
@@ -73,6 +73,7 @@
 
 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,8 +133,9 @@
 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)
 libgcjawt_la_DEPENDENCIES = libgcj.zip $(awto_files)
@@ -141,7 +143,7 @@
 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,


More information about the Java-patches mailing list