[Python-checkins] python/dist/src/Demo/embed Makefile,1.11,1.11.8.1

[jhylton@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Demo/embed
In directory sc8-pr-cvs1:/tmp/cvs-serv27228/Demo/embed

Modified Files:
      Tag: ast-branch
	Makefile 
Log Message:
Merge head to this branch.

Merge all sorts of changes from just before 2.3b1 into the ast
branch.  This should make the eventual merge back to the trunk easier.

The merge is almost entirely porting changes into the ast-branch.
There was no attempt to get changes to compile.c into newcompile.c.
That work should be done when newcompile.c is closer to completion.

The only significant conflicts appeared to be in pythonrun.c.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Demo/embed/Makefile,v
retrieving revision 1.11
retrieving revision 1.11.8.1
diff -C2 -d -r1.11 -r1.11.8.1
*** Makefile	17 Nov 2001 06:28:08 -0000	1.11
--- Makefile	28 Apr 2003 17:39:04 -0000	1.11.8.1
***************
*** 11,15 ****
  
  # Python version
! VERSION=	2.2
  
  # Compiler flags
--- 11,15 ----
  
  # Python version
! VERSION=	2.3
  
  # Compiler flags
***************
*** 29,33 ****
  ALLLIBS=	$(LIBPYTHON) $(MODLIBS) $(LIBS) $(SYSLIBS)
  
! # Build the demo application
  all:		demo loop importexc
  demo:		demo.o
--- 29,33 ----
  ALLLIBS=	$(LIBPYTHON) $(MODLIBS) $(LIBS) $(SYSLIBS)
  
! # Build the demo applications
  all:		demo loop importexc
  demo:		demo.o