@@ -264,7 +264,43 @@ SRC.MODULES= $(addprefix $(TOP), \
264264 Modules/gcmodule.c \
265265 Modules/signalmodule.c \
266266 Modules/posixmodule.c \
267- Modules/threadmodule.c
267+ Modules/threadmodule.c \
268+ Modules/arraymodule.c \
269+ Modules/binascii.c \
270+ Modules/cmathmodule.c \
271+ Modules/_codecsmodule.c \
272+ Modules/cPickle.c \
273+ Modules/cStringIO.c \
274+ Modules/_csv.c \
275+ Modules/datetimemodule.c \
276+ Modules/dlmodule.c \
277+ Modules/errnomodule.c \
278+ Modules/fcntlmodule.c \
279+ Modules/imageop.c \
280+ Modules/itertoolsmodule.c \
281+ Modules/_localemodule.c \
282+ Modules/mathmodule.c \
283+ Modules/md5c.c \
284+ Modules/md5module.c \
285+ Modules/operator.c \
286+ Modules/pcremodule.c \
287+ Modules/pypcre.c \
288+ Modules/_randommodule.c \
289+ Modules/regexmodule.c \
290+ Modules/regexpr.c \
291+ Modules/rgbimgmodule.c \
292+ Modules/shamodule.c \
293+ Modules/_sre.c \
294+ Modules/stropmodule.c \
295+ Modules/structmodule.c \
296+ Modules/symtablemodule.c \
297+ Modules/termios.c \
298+ Modules/timemodule.c \
299+ Modules/timingmodule.c \
300+ Modules/_weakref.c \
301+ Modules/xreadlinesmodule.c \
302+ Modules/xxsubtype.c \
303+ Modules/zipimport.c)
268304SRC.PARSE1 = $(addprefix $(TOP ) , \
269305 Parser/acceler.c \
270306 Parser/grammar1.c \
@@ -376,53 +412,20 @@ SRC.PMEXE= pythonpm.c
376412# 2) use the standard module naming convention
377413# (the 'module' in ?????module.c is assumed)
378414# - these can be built with implicit rules
379- EASYEXTMODULES = array \
380- cmath \
381- _codecs \
382- datetime \
383- dl \
384- errno \
385- fcntl \
386- fpectl \
415+ EASYEXTMODULES = fpectl \
387416 fpetest \
388- _locale \
389- math \
390417 parser \
391418 pwd \
392- _random \
393- rgbimg \
394419 rotor \
395- select \
396- sha \
397- strop \
398- struct \
399- time \
400- timing
420+ select
401421
402422# Python modules to be dynamically loaded that need explicit build rules
403423# (either multiple source files and/or non-standard module naming)
404424# (NOTE: use shortened names for modules affected by 8 char name limit)
405- HARDEXTMODULES = binascii \
406- cPickle \
407- cStringI \
408- _csv \
409- _hotshot \
410- imageop \
411- itertool \
412- md5 \
413- operator \
414- pcre \
415- regex \
425+ HARDEXTMODULES = _hotshot \
416426 _socket \
417- _sre \
418- _symtabl \
419- termios \
420427 _testcap \
421- unicoded \
422- _weakref \
423- xreadlin \
424- xxsubtyp \
425- zipimpor
428+ unicoded
426429
427430# Python external ($(MODULE.EXT)) modules - can be EASY or HARD
428431ifeq ($(HAVE_ZLIB ) ,yes)
@@ -528,63 +531,13 @@ $(PGEN.EXE): $(OBJ.PGEN) $(OUT)pgen.def
528531# Explicit building instructions for those external modules that require
529532# awkward handling (due e.g. to non-std naming, or multiple source files)
530533# - standard modules
531- binascii$(MODULE.EXT ) : $(OUT ) binascii$O $(OUT ) binascii_m.def $(PYTHON.IMPLIB )
532- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
533-
534- cPickle$(MODULE.EXT ) : $(OUT ) cPickle$O $(OUT ) cPickle_m.def $(PYTHON.IMPLIB )
535- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
536-
537- # cStringIO needs to be renamed to be useful (8 char DLL name limit)
538- cStringIO$(MODULE.EXT ) : $(OUT ) cStringIO$O $(OUT ) cStringIO_m.def $(PYTHON.IMPLIB )
539- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
540-
541- cStringI$(MODULE.EXT ) : cStringIO$(MODULE.EXT )
542- cp $^ $@
543-
544- _csv$(MODULE.EXT ) : $(OUT ) _csv$O $(OUT ) _csv_m.def $(PYTHON.IMPLIB )
545- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
546534
547535_hotshot$(MODULE.EXT ) : $(OUT ) _hotshot$O $(OUT ) _hotshot_m.def $(PYTHON.IMPLIB )
548536 $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
549537
550- imageop$(MODULE.EXT ) : $(OUT ) imageop$O $(OUT ) imageop_m.def $(PYTHON.IMPLIB )
551- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
552-
553- # itertools needs to be renamed to be useful
554- itertools$(MODULE.EXT ) : $(OUT ) itertoolsmodule$O $(OUT ) itertools_m.def $(PYTHON.IMPLIB )
555- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
556-
557- itertool$(MODULE.EXT ) : itertools$(MODULE.EXT )
558- cp $^ $@
559-
560- md5$(MODULE.EXT ) : $(OUT ) md5module$O $(OUT ) md5c$O $(OUT ) md5_m.def $(PYTHON.IMPLIB )
561- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
562-
563- operator$(MODULE.EXT ) : $(OUT ) operator$O $(OUT ) operator_m.def $(PYTHON.IMPLIB )
564- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
565-
566- pcre$(MODULE.EXT ) : $(OUT ) pcremodule$O $(OUT ) pypcre$O $(OUT ) pcre_m.def $(PYTHON.IMPLIB )
567- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
568-
569- regex$(MODULE.EXT ) : $(OUT ) regexmodule$O $(OUT ) regexpr$O $(OUT ) regex_m.def $(PYTHON.IMPLIB )
570- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
571-
572538_socket$(MODULE.EXT ) : $(OUT ) socketmodule$O $(OUT ) _socket_m.def $(PYTHON.IMPLIB )
573539 $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
574540
575- _sre$(MODULE.EXT ) : $(OUT ) _sre$O $(OUT ) _sre_m.def $(PYTHON.IMPLIB )
576- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
577-
578- # _symtable needs to be renamed to be useful
579- _symtable$(MODULE.EXT ) : $(OUT ) symtablemodule$O $(OUT ) _symtable_m.def $(PYTHON.IMPLIB )
580- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
581-
582- _symtabl$(MODULE.EXT ) : _symtable$(MODULE.EXT )
583- cp $^ $@
584-
585- termios$(MODULE.EXT ) : $(OUT ) termios$O $(OUT ) termios_m.def $(PYTHON.IMPLIB )
586- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
587-
588541# _testcapi needs to be renamed to be useful
589542_testcapi$(MODULE.EXT ) : $(OUT ) _testcapimodule$O $(OUT ) _testcapi_m.def $(PYTHON.IMPLIB )
590543 $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
@@ -599,30 +552,6 @@ unicodedata$(MODULE.EXT): $(OUT)unicodedata$O $(OUT)unicodedata_m.def $(PYTHON.I
599552unicoded$(MODULE.EXT ) : unicodedata$(MODULE.EXT )
600553 cp $^ $@
601554
602- _weakref$(MODULE.EXT ) : $(OUT ) _weakref$O $(OUT ) _weakref_m.def $(PYTHON.IMPLIB )
603- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
604-
605- # xreadlines needs to be renamed to be useful
606- xreadlines$(MODULE.EXT ) : $(OUT ) xreadlinesmodule$O $(OUT ) xreadlines_m.def $(PYTHON.IMPLIB )
607- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
608-
609- xreadlin$(MODULE.EXT ) : xreadlines$(MODULE.EXT )
610- cp $^ $@
611-
612- # xxsubtype needs to be renamed to be useful
613- xxsubtype$(MODULE.EXT ) : $(OUT ) xxsubtype$O $(OUT ) xxsubtype_m.def $(PYTHON.IMPLIB )
614- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
615-
616- xxsubtyp$(MODULE.EXT ) : xxsubtype$(MODULE.EXT )
617- cp $^ $@
618-
619- # zipimport needs to be renamed to be useful
620- zipimport$(MODULE.EXT ) : $(OUT ) zipimport$O $(OUT ) zipimport_m.def $(PYTHON.IMPLIB )
621- $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) $(LIBS )
622-
623- zipimpor$(MODULE.EXT ) : zipimport$(MODULE.EXT )
624- cp $^ $@
625-
626555# - optional modules (requiring other software to be installed)
627556bsddb185$(MODULE.EXT ) : $(OUT ) bsddbmodule$O $(OUT ) bsddb185_m.def $(PYTHON.IMPLIB )
628557 $(LD ) $(LDFLAGS.DLL ) -o $@ $(^^ ) $(L^ ) -ldb $(LIBS )
0 commit comments