From: Steve Hay Date: Fri, 24 Nov 2006 17:11:34 +0000 (+0000) Subject: Remove redundant macros from win32 makefiles X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=47ef3394ce0adc2dd6291c76f6751875ee64322e;p=p5sagit%2Fp5-mst-13.2.git Remove redundant macros from win32 makefiles In the course of removing redundant ByteLoader references I found that various long lists of extensions are hopelessly out of date, e.g. Compress/Zlib should be Compress/Raw/Zlib and PerlIO/*, threads/* and others are missing. It seems that these lists of extensions serve no useful purpose anyway: in Makefile they are used to delete files that should already have been deleted by the Makefile for each module, and in makefile.mk DYNAMIC_EXT wasn't used at all! So the simplest remedy is to remove them. One less maintenance headache. p4raw-id: //depot/perl@29376 --- diff --git a/win32/Makefile b/win32/Makefile index e4573b5..5c6209a 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -773,153 +773,7 @@ SETARGV_OBJ = setargv$(o) #STATIC_EXT = Cwd Compress/Raw/Zlib STATIC_EXT = -DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader -SOCKET = $(EXTDIR)\Socket\Socket -FCNTL = $(EXTDIR)\Fcntl\Fcntl -OPCODE = $(EXTDIR)\Opcode\Opcode -SDBM_FILE = $(EXTDIR)\SDBM_File\SDBM_File -IO = $(EXTDIR)\IO\IO -POSIX = $(EXTDIR)\POSIX\POSIX -ATTRS = $(EXTDIR)\attrs\attrs -THREAD = $(EXTDIR)\Thread\Thread -B = $(EXTDIR)\B\B -RE = $(EXTDIR)\re\re -DUMPER = $(EXTDIR)\Data\Dumper\Dumper -ERRNO = $(EXTDIR)\Errno\Errno -PEEK = $(EXTDIR)\Devel\Peek\Peek -BYTELOADER = $(EXTDIR)\ByteLoader\ByteLoader -DPROF = $(EXTDIR)\Devel\DProf\DProf -GLOB = $(EXTDIR)\File\Glob\Glob -HOSTNAME = $(EXTDIR)\Sys\Hostname\Hostname -STORABLE = $(EXTDIR)\Storable\Storable -FILTER = $(EXTDIR)\Filter\Util\Call\Call -ENCODE = $(EXTDIR)\Encode\Encode -MD5 = $(EXTDIR)\Digest\MD5\MD5 -SHA = $(EXTDIR)\Digest\SHA\SHA -PERLIOSCALAR = $(EXTDIR)\PerlIO\scalar\scalar -MIMEBASE64 = $(EXTDIR)\MIME\Base64\Base64 -TIMEHIRES = $(EXTDIR)\Time\HiRes\HiRes -CWD = $(EXTDIR)\Cwd\Cwd -LISTUTIL = $(EXTDIR)\List\Util\Util -HASHUTIL = $(EXTDIR)\Hash\Util\Util -PERLIOVIA = $(EXTDIR)\PerlIO\via\via -XSAPITEST = $(EXTDIR)\XS\APItest\APItest -XSTYPEMAP = $(EXTDIR)\XS\Typemap\Typemap -UNICODENORMALIZE = $(EXTDIR)\Unicode\Normalize\Normalize -MATHBIGINTFASTCALC = $(EXTDIR)\Math\BigInt\FastCalc\FastCalc -COMPRESSZLIB = $(EXTDIR)\Compress\Zlib\Zlib -WIN32_DIR = ext\Win32 -WIN32APIFILE = ext\Win32API\File\File - -SOCKET_DLL = $(AUTODIR)\Socket\Socket.dll -FCNTL_DLL = $(AUTODIR)\Fcntl\Fcntl.dll -OPCODE_DLL = $(AUTODIR)\Opcode\Opcode.dll -SDBM_FILE_DLL = $(AUTODIR)\SDBM_File\SDBM_File.dll -IO_DLL = $(AUTODIR)\IO\IO.dll -POSIX_DLL = $(AUTODIR)\POSIX\POSIX.dll -ATTRS_DLL = $(AUTODIR)\attrs\attrs.dll -THREAD_DLL = $(AUTODIR)\Thread\Thread.dll -B_DLL = $(AUTODIR)\B\B.dll -DUMPER_DLL = $(AUTODIR)\Data\Dumper\Dumper.dll -PEEK_DLL = $(AUTODIR)\Devel\Peek\Peek.dll -RE_DLL = $(AUTODIR)\re\re.dll -BYTELOADER_DLL = $(AUTODIR)\ByteLoader\ByteLoader.dll -DPROF_DLL = $(AUTODIR)\Devel\DProf\DProf.dll -GLOB_DLL = $(AUTODIR)\File\Glob\Glob.dll -HOSTNAME_DLL = $(AUTODIR)\Sys\Hostname\Hostname.dll -STORABLE_DLL = $(AUTODIR)\Storable\Storable.dll -FILTER_DLL = $(AUTODIR)\Filter\Util\Call\Call.dll -ENCODE_DLL = $(AUTODIR)\Encode\Encode.dll -MD5_DLL = $(AUTODIR)\Digest\MD5\MD5.dll -SHA_DLL = $(AUTODIR)\Digest\SHA\SHA.dll -PERLIOSCALAR_DLL = $(AUTODIR)\PerlIO\scalar\scalar.dll -MIMEBASE64_DLL = $(AUTODIR)\MIME\Base64\Base64.dll -TIMEHIRES_DLL = $(AUTODIR)\Time\HiRes\HiRes.dll -CWD_DLL = $(AUTODIR)\Cwd\Cwd.dll -LISTUTIL_DLL = $(AUTODIR)\List\Util\Util.dll -HASHUTIL_DLL = $(AUTODIR)\HASH\Util\Util.dll -PERLIOVIA_DLL = $(AUTODIR)\PerlIO\via\via.dll -XSAPITEST_DLL = $(AUTODIR)\XS\APItest\APItest.dll -XSTYPEMAP_DLL = $(AUTODIR)\XS\Typemap\Typemap.dll -UNICODENORMALIZE_DLL = $(AUTODIR)\Unicode\Normalize\Normalize.dll -MATHBIGINTFASTCALC_DLL = $(AUTODIR)\Math\BigInt\FastCalc\FastCalc.dll -COMPRESSZLIB_DLL = $(AUTODIR)\Compress\Zlib\Zlib.dll -WIN32_DLL = $(AUTODIR)\Win32\Win32.dll -WIN32APIFILE_DLL = $(AUTODIR)\Win32API\File\File.dll - -EXTENSION_C = \ - $(SOCKET).c \ - $(FCNTL).c \ - $(OPCODE).c \ - $(SDBM_FILE).c \ - $(IO).c \ - $(POSIX).c \ - $(ATTRS).c \ - $(THREAD).c \ - $(RE).c \ - $(DUMPER).c \ - $(PEEK).c \ - $(B).c \ - $(BYTELOADER).c \ - $(DPROF).c \ - $(GLOB).c \ - $(HOSTNAME).c \ - $(STORABLE).c \ - $(FILTER).c \ - $(ENCODE).c \ - $(MD5).c \ - $(SHA).c \ - $(PERLIOSCALAR).c \ - $(MIMEBASE64).c \ - $(TIMEHIRES).c \ - $(CWD).c \ - $(LISTUTIL).c \ - $(HASHUTIL).c \ - $(PERLIOVIA).c \ - $(XSAPITEST).c \ - $(XSTYPEMAP).c \ - $(UNICODENORMALIZE).c \ - $(MATHBIGINTFASTCALC).c \ - $(COMPRESSZLIB).c \ - $(WIN32_DIR).c \ - $(WIN32APIFILE).c - -EXTENSION_DLL = \ - $(SOCKET_DLL) \ - $(FCNTL_DLL) \ - $(OPCODE_DLL) \ - $(SDBM_FILE_DLL)\ - $(IO_DLL) \ - $(POSIX_DLL) \ - $(ATTRS_DLL) \ - $(DUMPER_DLL) \ - $(PEEK_DLL) \ - $(B_DLL) \ - $(RE_DLL) \ - $(THREAD_DLL) \ - $(BYTELOADER_DLL) \ - $(DPROF_DLL) \ - $(GLOB_DLL) \ - $(HOSTNAME_DLL) \ - $(STORABLE_DLL) \ - $(FILTER_DLL) \ - $(ENCODE_DLL) \ - $(MD5_DLL) \ - $(SHA_DLL) \ - $(PERLIOSCALAR_DLL) \ - $(MIMEBASE64_DLL) \ - $(TIMEHIRES_DLL) \ - $(CWD_DLL) \ - $(LISTUTIL_DLL) \ - $(HASHUTIL_DLL) \ - $(PERLIOVIA_DLL) \ - $(XSAPITEST_DLL) \ - $(XSTYPEMAP_DLL) \ - $(UNICODENORMALIZE_DLL) \ - $(MATHBIGINTFASTCALC_DLL) \ - $(COMPRESSZLIB_DLL) \ - $(WIN32_DLL) \ - $(WIN32APIFILE_DLL) +DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader CFG_VARS = \ "INST_DRV=$(INST_DRV)" \ @@ -1242,8 +1096,7 @@ distclean: realclean $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD) \ $(PERLEXESTATIC) $(PERLSTATICLIB) -del /f *.def *.map - -del /f $(EXTENSION_DLL) - -del /f $(EXTENSION_C) $(DYNALOADER).c $(ERRNO).pm + -del /f $(DYNALOADER).c -del /f $(EXTDIR)\DynaLoader\dl_win32.xs -del /f $(EXTDIR)\DynaLoader\DynaLoader.pm -del /f $(EXTDIR)\DynaLoader\XSLoader.pm @@ -1255,7 +1108,6 @@ distclean: realclean -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm -del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm - -del /f $(LIBDIR)\ByteLoader.pm -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm -del /f $(LIBDIR)\Devel\PPPort.pm -del /f $(LIBDIR)\File\Glob.pm diff --git a/win32/makefile.mk b/win32/makefile.mk index 09f4b57..e81a5df 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -936,14 +936,9 @@ PERLDLL_OBJ += $(WIN32_OBJ) $(DLL_OBJ) SETARGV_OBJ = setargv$(o) .ENDIF -DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B re \ - Data/Dumper Devel/Peek ByteLoader Devel/DProf File/Glob \ - Sys/Hostname Storable Filter/Util/Call Encode \ - Digest/MD5 Digest/SHA PerlIO/scalar MIME/Base64 Time/HiRes \ - Unicode/Normalize Math/BigInt/FastCalc Compress/Zlib Win32 \ - Win32API/File +# specify static extensions here +#STATIC_EXT = Cwd Compress/Raw/Zlib STATIC_EXT = -NONXS_EXT = Errno DYNALOADER = $(EXTDIR)\DynaLoader\DynaLoader @@ -1437,7 +1432,6 @@ distclean: realclean -del /f $(LIBDIR)\ops.pm $(LIBDIR)\Safe.pm -del /f $(LIBDIR)\SDBM_File.pm $(LIBDIR)\Socket.pm $(LIBDIR)\POSIX.pm -del /f $(LIBDIR)\B.pm $(LIBDIR)\O.pm $(LIBDIR)\re.pm - -del /f $(LIBDIR)\ByteLoader.pm -del /f $(LIBDIR)\Devel\Peek.pm $(LIBDIR)\Devel\DProf.pm -del /f $(LIBDIR)\Devel\PPPort.pm -del /f $(LIBDIR)\File\Glob.pm