diff options
| author | Andrew MacIntyre <andymac@bullseye.apana.org.au> | 2002-06-10 08:04:29 (GMT) |
|---|---|---|
| committer | Andrew MacIntyre <andymac@bullseye.apana.org.au> | 2002-06-10 08:04:29 (GMT) |
| commit | 4a79e360181a04ce1ac9644aa23c15d7c8a25e82 (patch) | |
| tree | 958f0c8ba6eb81be36f51491d45abadec3446b61 | |
| parent | 388fbf3d4a624becfbdedf6ec1dd57b57a5642ec (diff) | |
| download | cpython-4a79e360181a04ce1ac9644aa23c15d7c8a25e82.zip cpython-4a79e360181a04ce1ac9644aa23c15d7c8a25e82.tar.gz cpython-4a79e360181a04ce1ac9644aa23c15d7c8a25e82.tar.bz2 | |
make _sre a dynamically loadable module and build xxsubtype
| -rw-r--r-- | PC/os2emx/Makefile | 17 | ||||
| -rw-r--r-- | PC/os2emx/config.c | 4 |
2 files changed, 17 insertions, 4 deletions
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile index dcd6d16..49aa380 100644 --- a/PC/os2emx/Makefile +++ b/PC/os2emx/Makefile @@ -252,8 +252,7 @@ SRC.MODULES= $(addprefix $(TOP), \ Modules/gcmodule.c \ Modules/signalmodule.c \ Modules/posixmodule.c \ - Modules/threadmodule.c \ - Modules/_sre.c) + Modules/threadmodule.c) SRC.PARSER= $(addprefix $(TOP), \ Parser/acceler.c \ Parser/grammar1.c \ @@ -382,11 +381,13 @@ HARDEXTMODULES= binascii \ pcre \ regex \ _socket \ + _sre \ termios \ _testcap \ unicoded \ _weakref \ - xreadlin + xreadlin \ + xxsubtyp # Python external ($(MODULE.EXT)) modules - can be EASY or HARD ifeq ($(ZLIB),yes) @@ -513,6 +514,9 @@ regex$(MODULE.EXT): $(OUT)regexmodule$O $(OUT)regexpr$O $(OUT)regex_m.def $(PYTH _socket$(MODULE.EXT): $(OUT)socketmodule$O $(OUT)_socket_m.def $(PYTHON.IMPLIB) $(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) $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) @@ -547,6 +551,13 @@ xreadlines$(MODULE.EXT): $(OUT)xreadlinesmodule$O $(OUT)xreadlines_m.def $(PYTHO 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 $^ $@ + # - optional modules (requiring other software to be installed) bsddb$(MODULE.EXT): $(OUT)bsddbmodule$O $(OUT)bsddb_m.def $(PYTHON.IMPLIB) $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) -ldb $(LIBS) diff --git a/PC/os2emx/config.c b/PC/os2emx/config.c index 89f8dc3..91f855e 100644 --- a/PC/os2emx/config.c +++ b/PC/os2emx/config.c @@ -80,6 +80,7 @@ extern void inittime(); extern void inittiming(); extern void initunicodedata(); extern void initxreadlines(); +extern void initxxsubtype(); extern void initzlib(); /* -- ADDMODULE MARKER 1 -- */ @@ -91,7 +92,6 @@ struct _inittab _PyImport_Inittab[] = { {"gc", initgc}, {"os2", initos2}, - {"_sre", init_sre}, {"signal", initsignal}, #ifdef WITH_THREAD {"thread", initthread}, @@ -102,6 +102,7 @@ struct _inittab _PyImport_Inittab[] = { {"_curses_panel", init_curses_panel}, {"_hotshot", init_hotshot}, {"_locale", init_locale}, + {"_sre", init_sre}, {"_testcapi", init_testcapi}, {"_weakref", init_weakref}, {"array", initarray}, @@ -134,6 +135,7 @@ struct _inittab _PyImport_Inittab[] = { {"timing", inittiming}, {"unicodedata", initunicodedata}, {"xreadlines", initxreadlines}, + {"xxsubtype", initxxsubtype}, {"zlib", initzlib}, #ifdef USE_SOCKET {"_socket", init_socket}, |