[Python-checkins] python/dist/src Makefile.pre.in,1.86,1.86.2.1

jhylton@users.sourceforge.net jhylton@users.sourceforge.net
Sun, 07 Jul 2002 10:37:25 -0700


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv29437

Modified Files:
      Tag: ast-branch
	Makefile.pre.in 
Log Message:
Add commands to generate and build with AST code

XXX The Python-ast.h/.c files are generated, but I'm going to keep tem
under CVS, too.  Otherwise a Python build would require an existing
Python install.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.86
retrieving revision 1.86.2.1
diff -C2 -d -r1.86 -r1.86.2.1
*** Makefile.pre.in	21 Jun 2002 14:48:36 -0000	1.86
--- Makefile.pre.in	7 Jul 2002 17:37:22 -0000	1.86.2.1
***************
*** 194,198 ****
  		Parser/tokenizer.o \
  		Parser/bitset.o \
! 		Parser/metagrammar.o
  
  PARSER_OBJS=	$(POBJS) Parser/myreadline.o
--- 194,198 ----
  		Parser/tokenizer.o \
  		Parser/bitset.o \
! 		Parser/metagrammar.o 
  
  PARSER_OBJS=	$(POBJS) Parser/myreadline.o
***************
*** 209,216 ****
--- 209,227 ----
  PGENOBJS=	$(PGENMAIN) $(POBJS) $(PGOBJS)
  
+ ##########################################################################
+ # AST
+ AST_H=		$(srcdir)/Include/Python-ast.h
+ AST_C=		$(srcdir)/Python/Python-ast.c
+ AST_ASDL=	$(srcdir)/Parser/Python.asdl
+ 
+ # XXX Note that a build now requires Python exist before the build starts
+ ASDLGEN=	$(srcdir)/Parser/asdl_c.py -h $(srcdir)/Include -c $(srcdir)/Python
  
  ##########################################################################
  # Python
  PYTHON_OBJS=	\
+ 		Python/Python-ast.o \
+ 		Python/asdl.o \
+ 		Python/ast.o \
  		Python/bltinmodule.o \
  		Python/exceptions.o \
***************
*** 417,422 ****
  Parser/metagrammar.o:	$(srcdir)/Parser/metagrammar.c
  
  
! Python/compile.o Python/symtable.o: $(GRAMMAR_H)
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
--- 428,435 ----
  Parser/metagrammar.o:	$(srcdir)/Parser/metagrammar.c
  
+ $(AST_H) $(AST_C): $(AST_ASDL)
+ 	$(ASDLGEN) $(AST_ASDL)
  
! Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)
  
  Python/getplatform.o: $(srcdir)/Python/getplatform.c
***************
*** 434,437 ****
--- 447,452 ----
  PYTHON_HEADERS= \
  		Include/Python.h \
+ 		Include/Python-ast.h \
+ 		Include/asdl.h \
  		Include/abstract.h \
  		Include/boolobject.h \