[Python-checkins] python/dist/src/PC/os2emx config.c,1.1,1.2 Makefile,1.3,1.4

aimacintyre@users.sourceforge.net aimacintyre@users.sourceforge.net
Mon, 10 Jun 2002 01:04:31 -0700


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

Modified Files:
	config.c Makefile 
Log Message:
make _sre a dynamically loadable module and build xxsubtype

Index: config.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.c	17 Feb 2002 05:23:30 -0000	1.1
--- config.c	10 Jun 2002 08:04:29 -0000	1.2
***************
*** 81,84 ****
--- 81,85 ----
  extern void initunicodedata();
  extern void initxreadlines();
+ extern void initxxsubtype();
  extern void initzlib();
  
***************
*** 92,96 ****
  	{"gc", initgc},
          {"os2", initos2},
-         {"_sre", init_sre},
          {"signal", initsignal},
  #ifdef WITH_THREAD
--- 93,96 ----
***************
*** 103,106 ****
--- 103,107 ----
  	{"_hotshot", init_hotshot},
  	{"_locale", init_locale},
+         {"_sre", init_sre},
  	{"_testcapi", init_testcapi},
  	{"_weakref", init_weakref},
***************
*** 135,138 ****
--- 136,140 ----
  	{"unicodedata", initunicodedata},
  	{"xreadlines", initxreadlines},
+ 	{"xxsubtype", initxxsubtype},
  	{"zlib", initzlib},
  #ifdef USE_SOCKET

Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	30 Apr 2002 13:06:32 -0000	1.3
--- Makefile	10 Jun 2002 08:04:29 -0000	1.4
***************
*** 253,258 ****
  		Modules/signalmodule.c \
  		Modules/posixmodule.c \
! 		Modules/threadmodule.c \
! 		Modules/_sre.c)
  SRC.PARSER=	$(addprefix $(TOP), \
  		Parser/acceler.c \
--- 253,257 ----
  		Modules/signalmodule.c \
  		Modules/posixmodule.c \
! 		Modules/threadmodule.c)
  SRC.PARSER=	$(addprefix $(TOP), \
  		Parser/acceler.c \
***************
*** 383,391 ****
  		regex \
  		_socket \
  		termios \
  		_testcap \
  		unicoded \
  		_weakref \
! 		xreadlin
  
  # Python external ($(MODULE.EXT)) modules - can be EASY or HARD
--- 382,392 ----
  		regex \
  		_socket \
+ 		_sre \
  		termios \
  		_testcap \
  		unicoded \
  		_weakref \
! 		xreadlin \
! 		xxsubtyp
  
  # Python external ($(MODULE.EXT)) modules - can be EASY or HARD
***************
*** 514,517 ****
--- 515,521 ----
  	$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
  
+ _sre$(MODULE.EXT): $(OUT)_sre$O $(OUT)_sre_m.def $(PYTHON.IMPLIB)
+ 	$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
+ 
  # _symtable needs to be renamed to be useful
  _symtable$(MODULE.EXT): $(OUT)symtablemodule$O $(OUT)_symtable_m.def $(PYTHON.IMPLIB)
***************
*** 546,549 ****
--- 550,560 ----
  
  xreadlin$(MODULE.EXT): xreadlines$(MODULE.EXT)
+ 	cp $^ $@
+ 
+ # xxsubtype needs to be renamed to be useful
+ xxsubtype$(MODULE.EXT): $(OUT)xxsubtype$O $(OUT)xxsubtype_m.def $(PYTHON.IMPLIB)
+ 	$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
+ 
+ xxsubtyp$(MODULE.EXT): xxsubtype$(MODULE.EXT)
  	cp $^ $@