diff options
| author | Kelley Cook <kcook@gcc.gnu.org> | 2004-01-15 04:02:24 +0000 |
|---|---|---|
| committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2004-01-15 04:02:24 +0000 |
| commit | 03787dfd815361040684ba2b4dab504968730201 (patch) | |
| tree | ee011f5091b62b8a6163fe4051e3b30fb83b3941 /gcc/java/Make-lang.in | |
| parent | 04ab46a41dc1618a0bf9cb8d21ef8cb50046e747 (diff) | |
| download | gcc-03787dfd815361040684ba2b4dab504968730201.zip gcc-03787dfd815361040684ba2b4dab504968730201.tar.gz gcc-03787dfd815361040684ba2b4dab504968730201.tar.bz2 | |
re PR bootstrap/12744 (A GCC release tarball can no longer be built without bison/flex)
gcc/
2004-01-15 Kelley Cook <kcook@gcc.gnu.org>
PR bootstrap/12744
* configure.in: Revamp enable-generated-files-in-srcdir rule to define
GENINSRC and not parsedir. Define srcextra as a langhook.
* configure: Regenerate.
* Makefile.in: Suppress default .l.c rule. Don't substitute
parsedir and delete all references throughout. Conditionally define
rule for srcextra dependent on GENINSRC.
(stmp-docobjdir): Delete.
(c-parse.o, gengtype-lex.o, gengtype-yacc.o): Use implicit build rule.
(srcextra): Copy c-parse.y, c-parse.c, gengtype-lex.c, gengtype-yacc.c,
and gengtype-yacc.h back to source directory.
(maintainer-clean): Delete all parse files in source directory.
(distclean): Delete generated files.
* objc/Make-lang.in (objc-parse.o): Use implicit build rule.
(objc-parse.c, objc-parse.y): Don't use parsedir.
(objc.srcextra): Copy objc-parse.y and objc-parse.c back to source
directory if requested.
(po-generated): Don't use parsedir.
(objc.maintainer-clean): Delete above files from source directory.
gcc/ada/
2004-01-15 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (ada.srcextra): Dummy entry.
gcc/cp/
2004-01-15 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (c++.srcextra): Dummy entry.
gcc/f/
2004-01-15 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (f77.srcextra): Dummy entry.
gcc/java/
2004-01-15 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (parse.c, parse-scan.c): Always build in doc directory.
(java.srcextra): Copy above back to source directory if requested.
(po-generated): Delete reference to $(parsedir).
(java/parse.o, java/parse-scan.o): Delete reference to $(parsedir).
Use implicit rule.
gcc/treelang/
2004-01-15 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (TREE_GENERATED): Delete reference to $(parsedir).
(treelang/parse.o, treelang/lex.o): Look for sources in build
directory. Use implicit rule.
(treelang/parse.c, treelang/parse.h treelang/lex.c): Always build in
doc directory.
(treelang.srcextra): Copy above back to source directory if requested.
From-SVN: r75903
Diffstat (limited to 'gcc/java/Make-lang.in')
| -rw-r--r-- | gcc/java/Make-lang.in | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index fc6adf9..23912e8 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -76,16 +76,16 @@ $(GCJ)-cross$(exeext): $(GCJ)$(exeext) -rm -f $(GCJ)-cross$(exeext) cp $(GCJ)$(exeext) $(GCJ)-cross$(exeext) -po-generated: $(parsedir)/java/parse.c $(parsedir)/java/parse-scan.c +po-generated: java/parse.c java/parse-scan.c -$(parsedir)/java/parse.c: $(srcdir)/java/parse.y - $(BISON) -t --name-prefix=java_ $(BISONFLAGS) \ - -o p$$$$.c $(srcdir)/java/parse.y && \ - mv -f p$$$$.c $(parsedir)/java/parse.c +java.srcextra: java/parse.c java/parse-scan.c + -cp -p $^ $(srcdir)/java -$(parsedir)/java/parse-scan.c: $(srcdir)/java/parse-scan.y - $(BISON) -t $(BISONFLAGS) -o ps$$$$.c $(srcdir)/java/parse-scan.y && \ - mv -f ps$$$$.c $(parsedir)/java/parse-scan.c +java/parse.c: java/parse.y + -$(BISON) -t --name-prefix=java_ $(BISONFLAGS) -o $@ $< + +java/parse-scan.c: java/parse-scan.y + -$(BISON) -t $(BISONFLAGS) -o $@ $< $(srcdir)/java/keyword.h: $(srcdir)/java/keyword.gperf (cd $(srcdir)/java || exit 1; \ @@ -228,15 +228,15 @@ install-info:: $(DESTDIR)$(infodir)/gcj.info # We just have to delete files specific to us. java.mostlyclean: + -rm -f java/parse.c java/parse-scan.c -rm -f java/*$(objext) $(DEMANGLER_PROG) -rm -f java/*$(coverageexts) -rm -f jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext) s-java java.clean: java.distclean: -rm -f java/config.status java/Makefile - -rm -f java/parse.output + -rm -f java/parse.output java/y.tab.c java.maintainer-clean: - -rm -f $(parsedir)/java/parse.c $(parsedir)/java/parse-scan.c java/parse.output java/y.tab.c -rm -f $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1 -rm -f $(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1 -rm -f $(docobjdir)/gij.1 @@ -325,18 +325,11 @@ java/xref.o: java/xref.c java/xref.h $(CONFIG_H) $(JAVA_TREE_H) toplev.h \ $(SYSTEM_H) coretypes.h $(TM_H) java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ java/zipfile.h - -# parse-scan.o and parse.o compiled from $(parsedir)/java -java/parse-scan.o: $(parsedir)/java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) \ +java/parse-scan.o: java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) toplev.h $(JAVA_LEX_C) java/parse.h java/lex.h input.h - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(parsedir)/java/parse-scan.c $(OUTPUT_OPTION) - -java/parse.o: $(parsedir)/java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \ +java/parse.o: java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) function.h $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h \ java/lex.h input.h $(GGC_H) debug.h gt-java-parse.h gtype-java.h - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(parsedir)/java/parse.c $(OUTPUT_OPTION) # jcf-io.o needs $(ZLIBINC) added to cflags. java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ |