From c20012b63373eacba50e92e918a48baf7f239054 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Mon, 19 Oct 1998 06:43:55 -0700 Subject: [PATCH] =?UTF-8?q?=EF=BF=BD=20Undo=20some=20mistakes=20from=20pre?= =?UTF-8?q?vious=20merge.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From-SVN: r23183 --- gcc/java/Makefile.in | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in index cea2235a8b5..25eedf552b7 100644 --- 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: