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

1 files changed, 14 insertions, 20 deletions

diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index fe92a50..70b9e4d 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -62,11 +62,9 @@ objc/objc-lang.o : objc/objc-lang.c \
    $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) c-tree.h \
    c-common.h toplev.h objc/objc-act.h langhooks.h $(LANGHOOKS_DEF_H)
 
-objc/objc-parse.o : $(parsedir)/objc/objc-parse.c \
+objc/objc-parse.o : objc/objc-parse.c \
    $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(C_TREE_H) \
    toplev.h $(GGC_H) c-pragma.h input.h flags.h output.h objc/objc-act.h
-	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-	$(parsedir)/objc/objc-parse.c $(OUTPUT_OPTION)
 
 objc/objc-act.o : objc/objc-act.c \
    $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) $(TM_P_H) \
@@ -74,23 +72,19 @@ objc/objc-act.o : objc/objc-act.c \
    objc/objc-act.h input.h function.h output.h debug.h langhooks.h \
    $(LANGHOOKS_DEF_H) gt-objc-objc-act.h gtype-objc.h
 
-po-generated: $(parsedir)/objc/objc-parse.c
-$(parsedir)/objc/objc-parse.c : $(parsedir)/objc/objc-parse.y
-	cd $(parsedir)/objc; \
-	if $(BISON) $(BISONFLAGS) -o op$$$$.c objc-parse.y ; then \
-	  test -f op$$$$.output && mv -f op$$$$.output objc-parse.output ; \
-	  mv -f op$$$$.c objc-parse.c ; \
-	else \
-	  rm -f op$$$$.* ; \
-	  false ; \
-	fi
-
-$(parsedir)/objc/objc-parse.y: $(srcdir)/c-parse.in
+po-generated: objc/objc-parse.c
+
+objc.srcextra: objc/objc-parse.c objc/objc-parse.y
+	-cp -p $^ $(srcdir)/objc
+ 
+objc/objc-parse.c : objc/objc-parse.y
+	-$(BISON) $(BISONFLAGS) -o $@ $<
+
+objc/objc-parse.y: c-parse.in
 	echo '/*WARNING: This file is automatically generated!*/' >tmp-objc-prs.y
 	sed -e "/^@@ifc.*/,/^@@end_ifc.*/d" \
-	  -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" \
-	  $(srcdir)/c-parse.in >>tmp-objc-prs.y
-	$(SHELL) $(srcdir)/move-if-change tmp-objc-prs.y $(parsedir)/objc/objc-parse.y
+	    -e "/^@@ifobjc.*/d" -e "/^@@end_ifobjc.*/d" < $< >>tmp-objc-prs.y
+	$(SHELL) $(srcdir)/move-if-change tmp-objc-prs.y $@
 
 gtype-objc.h : s-gtype ; @true
 gt-objc-objc-act.h : s-gtype ; @true
@@ -127,6 +121,7 @@ objc.uninstall:
 objc.mostlyclean:
 	-rm -f tmp-objc-prs.y
 	-rm -f objc/*$(objext) objc/xforward objc/fflags
+	-rm -f objc/objc-parse.y objc/objc-parse.c objc/objc-parse.output
 	-rm -f objc/*$(coverageexts)
 objc.clean: objc.mostlyclean
 	-rm -rf objc-headers
@@ -135,8 +130,7 @@ objc.distclean:
 	-rm -f objc/config.status objc/config.cache
 	-rm -f objc-parse.output
 objc.maintainer-clean:
-	-rm -f $(parsedir)/objc/objc-parse.y
-	-rm -f $(parsedir)/objc/objc-parse.c $(parsedir)/objc/objc-parse.output
+	-rm -f $(srcdir)/objc/objc-parse.y $(srcdir)/objc/objc-parse.c 
 
 #
 # Stage hooks: