diff options
| author | Per Bothner <bothner@gcc.gnu.org> | 1998-10-19 06:43:55 -0700 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 1998-10-19 06:43:55 -0700 |
| commit | c20012b63373eacba50e92e918a48baf7f239054 (patch) | |
| tree | cbf2b17ee94325440a7708b7dd6c4165065f5e69 /gcc/java | |
| parent | dbcce8f8e83df43acbe213ddb422438080d8e666 (diff) | |
| download | gcc-c20012b63373eacba50e92e918a48baf7f239054.zip gcc-c20012b63373eacba50e92e918a48baf7f239054.tar.gz gcc-c20012b63373eacba50e92e918a48baf7f239054.tar.bz2 | |
�
Undo some mistakes from previous merge.
From-SVN: r23183
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/Makefile.in | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in index cea2235..25eedf5 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: |