[Python-checkins] python/dist/src/PC/os2emx Makefile,1.4,1.5

[aimacintyre@users.sourceforge.net]

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

Modified Files:
	Makefile 
Log Message:
Build process updates:
 - the security fixes to tempfile have lead to test_tempfile wanting 
   to create 100 temporary files.  as the EMX default is only 40, 
   the number of file handles has been bumped (up to 250).
 - changes to pgen have required restructuring its build support.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	10 Jun 2002 08:04:29 -0000	1.4
--- Makefile	18 Aug 2002 06:26:33 -0000	1.5
***************
*** 1,3 ****
! #####################==================----------------·············
  #
  # Top-Level Makefile for Building Python 2.3 for OS/2 using GCC/EMX
--- 1,3 ----
! #####################==================----------------
  #
  # Top-Level Makefile for Building Python 2.3 for OS/2 using GCC/EMX
***************
*** 22,26 ****
  #   make test		(optional)
  #
! #####################==================----------------·············
  
  # === Compilation mode: debug or release ===
--- 22,26 ----
  #   make test		(optional)
  #
! #####################==================----------------
  
  # === Compilation mode: debug or release ===
***************
*** 72,75 ****
--- 72,77 ----
  IMPLIB=		emximp
  EXPLIB=		emxexp
+ EXEOPT=		emxbind
+ 
  
  # adjust C compiler settings based on build options
***************
*** 113,116 ****
--- 115,122 ----
  endif
  
+ # EMX's default number of file handles is 40, which is sometimes insufficient
+ # (the tempfile regression test tries to create 100 temporary files)
+ NFILES=250
+ 
  # Source file paths
  SRCPATH=.;../../Python;../../Parser;../../Objects;../../Include;../../Modules
***************
*** 236,248 ****
  
  # Source files
- SRC.PGEN=	$(addprefix ../../Parser/, \
- 		pgenmain.c \
- 		pgen.c \
- 		printgrammar.c \
- 		grammar.c \
- 		bitset.c \
- 		firstsets.c)
- OBJ.PGEN=	$(addprefix $(OUT),$(notdir $(SRC.PGEN:.c=$O)))
- 
  SRC.OS2EMX=	config.c dlfcn.c getpathp.c
  SRC.MAIN=	$(addprefix $(TOP), \
--- 242,245 ----
***************
*** 254,258 ****
  		Modules/posixmodule.c \
  		Modules/threadmodule.c)
! SRC.PARSER=	$(addprefix $(TOP), \
  		Parser/acceler.c \
  		Parser/grammar1.c \
--- 251,255 ----
  		Modules/posixmodule.c \
  		Modules/threadmodule.c)
! SRC.PARSE1=	$(addprefix $(TOP), \
  		Parser/acceler.c \
  		Parser/grammar1.c \
***************
*** 261,268 ****
  		Parser/parser.c \
  		Parser/parsetok.c \
- 		Parser/tokenizer.c \
  		Parser/bitset.c \
! 		Parser/metagrammar.c \
  		Parser/myreadline.c)
  SRC.PYTHON=	$(addprefix $(TOP), \
  		Python/bltinmodule.c \
--- 258,268 ----
  		Parser/parser.c \
  		Parser/parsetok.c \
  		Parser/bitset.c \
! 		Parser/metagrammar.c)
! SRC.PARSE2=	$(addprefix $(TOP), \
! 		Parser/tokenizer.c \
  		Parser/myreadline.c)
+ SRC.PARSER=	$(SRC.PARSE1) \
+ 		$(SRC.PARSE2)
  SRC.PYTHON=	$(addprefix $(TOP), \
  		Python/bltinmodule.c \
***************
*** 339,342 ****
--- 339,357 ----
  OBJ.LIB=	$(addprefix $(OUT),$(notdir $(SRC.LIB:.c=$O)))
  
+ SRC.PGEN=	$(SRC.PARSE1) \
+ 		$(addprefix $(TOP), \
+ 		Objects/obmalloc.c) \
+ 		$(addprefix $(TOP), \
+ 		Python/mysnprintf.c) \
+ 		$(addprefix $(TOP), \
+ 		Parser/tokenizer_pgen.c \
+ 		Parser/pgenmain.c \
+ 		Parser/pgen.c \
+ 		Parser/printgrammar.c \
+ 		Parser/grammar.c \
+ 		Parser/firstsets.c) \
+ 		
+ OBJ.PGEN=	$(addprefix $(OUT),$(notdir $(SRC.PGEN:.c=$O)))
+ 
  SRC.EXE=	$(TOP)Modules/python.c
  SRC.PMEXE=	pythonpm.c
***************
*** 357,361 ****
  		_locale \
  		math \
- 		new \
  		parser \
  		pwd \
--- 372,375 ----
***************
*** 472,480 ****
  $(PYTHON.EXE): $(SRC.EXE) $(PYTHON.EXEIMP) $(OUT)python.def
  	$(CC) -Zmt $(LDMODE.EXE) -Zcrtdll -Wall $(INCLUDE) -L. -lgcc -o $@ $(SRC.EXE) $(PYTHON.EXEIMP) $(LIBS) $(OUT)python.def
  
  $(PYTHONPM.EXE): $(SRC.PMEXE) $(PYTHON.EXEIMP) $(OUT)pythonpm.def
  	$(CC) -Zmt $(LDMODE.EXE) -Zcrtdll -Wall $(INCLUDE) -L. -lgcc -o $@ $(SRC.PMEXE) $(PYTHON.EXEIMP) $(LIBS) $(OUT)pythonpm.def
  
! $(PGEN.EXE): $(OBJ.PGEN) $(PYTHON.LIB) $(OUT)pgen.def
  
  # Explicit building instructions for those external modules that require 
--- 486,496 ----
  $(PYTHON.EXE): $(SRC.EXE) $(PYTHON.EXEIMP) $(OUT)python.def
  	$(CC) -Zmt $(LDMODE.EXE) -Zcrtdll -Wall $(INCLUDE) -L. -lgcc -o $@ $(SRC.EXE) $(PYTHON.EXEIMP) $(LIBS) $(OUT)python.def
+ 	$(EXEOPT) -aq $(PYTHON.EXE) -h$(NFILES)
  
  $(PYTHONPM.EXE): $(SRC.PMEXE) $(PYTHON.EXEIMP) $(OUT)pythonpm.def
  	$(CC) -Zmt $(LDMODE.EXE) -Zcrtdll -Wall $(INCLUDE) -L. -lgcc -o $@ $(SRC.PMEXE) $(PYTHON.EXEIMP) $(LIBS) $(OUT)pythonpm.def
+ 	$(EXEOPT) -aq $(PYTHONPM.EXE) -h$(NFILES)
  
! $(PGEN.EXE): $(OBJ.PGEN) $(OUT)pgen.def
  
  # Explicit building instructions for those external modules that require 
***************
*** 632,636 ****
  # the test target
  test:
! 	./python -tt ../../lib/test/regrtest.py -l -u "network"
  
  -include $(OUTBASE)python.dep
--- 648,652 ----
  # the test target
  test:
! 	./python -E -tt ../../lib/test/regrtest.py -l -u "network"
  
  -include $(OUTBASE)python.dep