�

Undo some mistakes from previous merge.

From-SVN: r23183

diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in
index cea2235a8b5905e105beea91c76e8fa48ee07696..25eedf552b79b12795afb84a4dac841c4b197c34 100644 (file)
--- a/gcc/java/Makefile.in
+++ b/gcc/java/Makefile.in
@@ -148,12 +148,8 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS)
 # Likewise.
 ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
 
-# CYGNUS LOCAL: SUBDIR_USE_ALLOCA is different from FSF.
-# Even if ALLOCA is set, don't use it if compiling with GCC.
-
 SUBDIR_OBSTACK = `if [ x$(OBSTACK) != x ]; then echo ../$(OBSTACK); else true; fi`
-#SUBDIR_USE_ALLOCA = `case "${CC}" in "${OLDCC}") if [ x$(ALLOCA) != x ]; then echo ../$(ALLOCA); else true; fi ;; esac`
-SUBDIR_USE_ALLOCA = `if [ x$(ALLOCA) != x ]; then echo ../$(ALLOCA); else true; fi`
+SUBDIR_USE_ALLOCA = `case "${CC}" in "${OLDCC}") if [ x$(ALLOCA) != x ]; then echo ../$(ALLOCA); else true; fi ;; esac`
 SUBDIR_MALLOC = `if [ x$(MALLOC) != x ]; then echo ../$(MALLOC); else true; fi`
 
 # How to link with both our special library facilities
@@ -225,9 +221,8 @@ RTL_H = $(srcdir)/../rtl.h $(srcdir)/../rtl.def \
         $(srcdir)/../machmode.h $(srcdir)/../machmode.def
 EXPR_H = $(srcdir)/../expr.h ../insn-codes.h
 
-# CYGNUS LOCAL: we put these files into the build dir.
-PARSE_C = parse.c
-PARSE_SCAN_C = parse-scan.c
+PARSE_C = $(srcdir)/parse.c
+PARSE_SCAN_C = $(srcdir)/parse-scan.c
 PARSE_H = $(srcdir)/parse.h
 
 $(PARSE_C):  $(srcdir)/parse.y $(srcdir)/lex.c $(PARSE_H) $(srcdir)/lex.h
@@ -260,9 +255,7 @@ TAGS: force
 mostlyclean:
        rm -f *.o
 
-# CYGNUS LOCAL: Remove these files, as they are in the build dir.
 clean:  mostlyclean
-       rm -f parse.c parse-scan.c
 
 force: