47 lines
1.4 KiB
Plaintext
47 lines
1.4 KiB
Plaintext
--- Makefile.in.orig Wed Apr 7 16:52:30 1999
|
|
+++ Makefile.in Sat Apr 24 00:37:41 1999
|
|
@@ -73,6 +73,7 @@
|
|
AR = ar
|
|
AR_FLAGS = rc
|
|
CC = cc
|
|
+GCJ = gcj
|
|
|
|
# Special variables passed down in EXTRA_GCC_FLAGS. They are defined
|
|
# here so that they can be overridden by Makefile fragments.
|
|
@@ -382,6 +383,7 @@
|
|
"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
|
|
"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
|
|
"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
|
|
+ "GCJ=$(GCJ)" \
|
|
"INSTALL=$(INSTALL)" \
|
|
"INSTALL_DATA=$(INSTALL_DATA)" \
|
|
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
|
--- libjava/Makefile.in.orig Fri May 21 15:09:51 1999
|
|
+++ libjava/Makefile.in Sun May 30 22:39:59 1999
|
|
@@ -139,6 +139,8 @@
|
|
|
|
GCJCOMPILE = CLASSPATH=$(here) $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled $(JC1FLAGS) -c
|
|
|
|
+GCJ = gcj
|
|
+
|
|
JAVAC = $(GCJ) -C
|
|
|
|
EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
|
|
@@ -597,6 +593,7 @@
|
|
"CXXFLAGS=$(CXXFLAGS)" \
|
|
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
|
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
|
+ "GCJ=$(GCJ)" \
|
|
"INSTALL=$(INSTALL)" \
|
|
"INSTALL_DATA=$(INSTALL_DATA)" \
|
|
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
|
@@ -1382,7 +1377,7 @@
|
|
-d $(here) $?
|
|
|
|
libgcj.zip: $(java_source_files)
|
|
- $(MAKE) $(built_java_source_files:.java=.class)
|
|
+ $(MAKE) $(AM_MAKEFLAGS) $(built_java_source_files:.java=.class)
|
|
javac="$(JAVAC)"; cd $(srcdir); \
|
|
$$javac $(JCFLAGS) -classpath $(here):`/bin/pwd` -d $(here) \
|
|
$(subst $(srcdir)/,,$?)
|