A few Win32 makefile tidy-ups (No real changes)

[perl5.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index eb43c0f..93bcd87 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -32,7 +32,7 @@ INST_TOP      = $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER = \5.9.2
+#INST_VER      = \5.9.2
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -43,27 +43,27 @@ INST_TOP    = $(INST_DRV)\perl
 # the same location.  Commenting it out gives you a simpler
 # installation that is easier to understand for beginners.
 #
-#INST_ARCH = \$(ARCHNAME)
+#INST_ARCH     = \$(ARCHNAME)
 
 #
 # uncomment to enable multiple interpreters.  This is need for fork()
 # emulation and for thread support.
 #
-USE_MULTI = define
+USE_MULTI      = define
 
 #
 # Beginnings of interpreter cloning/threads; now reasonably complete.
 # This should be enabled to get the fork() emulation.  This needs
 # USE_MULTI as well.
 #
-USE_ITHREADS = define
+USE_ITHREADS   = define
 
 #
 # uncomment to enable the implicit "host" layer for all system calls
 # made by perl.  This needs USE_MULTI above.  This is also needed to
 # get fork().
 #
-USE_IMP_SYS = define
+USE_IMP_SYS    = define
 
 #
 # Comment out next assign to disable perl's I/O subsystem and use compiler's 
@@ -77,7 +77,7 @@ USE_PERLIO    = define
 # Comment this out if you don't want to enable large file support for
 # some reason.  Should normally only be changed to maintain compatibility
 # with an older release of perl.
-USE_LARGE_FILES = define
+USE_LARGE_FILES        = define
 
 #
 # uncomment one of the following lines if you are using either
@@ -141,7 +141,7 @@ CRYPT_SRC   = fcrypt.c
 # This must be enabled to use the Devel::Peek::mstat() function.  This cannot
 # be enabled without PERL_MALLOC as well.
 #
-#DEBUG_MSTATS  = define
+#DEBUG_MSTATS  = define
 
 #
 #
@@ -179,6 +179,7 @@ CCLIBDIR    = $(CCHOME)\lib
 #
 # This should normally be disabled.  Enabling it causes perl to read scripts
 # in text mode (which is the 5.005 behavior) and will break ByteLoader.
+#
 #BUILDOPT      = $(BUILDOPT) -DPERL_TEXTMODE_SCRIPTS
 
 #
@@ -206,21 +207,22 @@ D_CRYPT           = define
 CRYPT_FLAG     = -DHAVE_DES_FCRYPT
 !ENDIF
 
+!IF "$(USE_IMP_SYS)" == "define"
+PERL_MALLOC    = undef
+DEBUG_MSTATS   = undef
+!ENDIF
+
 !IF "$(PERL_MALLOC)" == ""
 PERL_MALLOC    = undef
-DEBUG_MSTATS   = undef
+DEBUG_MSTATS   = undef
 !ENDIF
 
 !IF "$(DEBUG_MSTATS)" == ""
-DEBUG_MSTATS   = undef
+DEBUG_MSTATS   = undef
 !ENDIF
 
 !IF "$(DEBUG_MSTATS)" == "define"
-BUILDOPT       = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
-!ENDIF
-
-!IF "$(USE_IMP_SYS)" == "define"
-PERL_MALLOC    = undef
+BUILDOPT       = $(BUILDOPT) -DPERL_DEBUGGING_MSTATS
 !ENDIF
 
 !IF "$(USE_MULTI)" == ""
@@ -489,6 +491,7 @@ UTILS               =                       \
                ..\utils\libnetcfg      \
                ..\utils\enc2xs         \
                ..\utils\piconv         \
+               ..\utils\corelist       \
                ..\utils\cpan           \
                ..\utils\xsubpp         \
                ..\utils\prove          \
@@ -523,7 +526,7 @@ CFGH_TMPL   = config_H.vc
 
 XCOPY          = xcopy /f /r /i /d
 RCOPY          = xcopy /f /r /i /e /d
-NOOP           = @echo
+NOOP           = @rem
 NULL           =
 
 DEL            = del
@@ -624,6 +627,7 @@ CORE_NOCFG_H        =               \
                ..\perly.h      \
                ..\pp.h         \
                ..\proto.h      \
+               ..\regcomp.h    \
                ..\regexp.h     \
                ..\scope.h      \
                ..\sv.h         \
@@ -1130,7 +1134,7 @@ distclean: realclean
            podchecker podselect
        -cd ..\utils && del /f h2ph splain perlbug pl2pm c2ph pstruct h2xs \
            perldoc perlivp dprofpp perlcc libnetcfg enc2xs piconv cpan *.bat \
-           xsubpp instmodsh prove
+           xsubpp instmodsh prove corelist
        -cd ..\x2p && del /f find2perl s2p psed *.bat
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)
@@ -1181,13 +1185,13 @@ test-prep : all utils
 
 test : test-prep
        cd ..\t
-       $(PERLEXE) -I..\lib harness
+       $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES)
        cd ..\win32
 
 test-notty : test-prep
        set PERL_SKIP_TTY_TEST=1
        cd ..\t
-       $(PERLEXE) -I..\lib harness
+       $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES)
        cd ..\win32
 
 _test : 
@@ -1195,7 +1199,7 @@ _test :
        $(XCOPY) $(PERLDLL) ..\t\$(NULL)
        $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
        cd ..\t
-       $(PERLEXE) -I..\lib harness
+       $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES)
        cd ..\win32
 
 # the doubled rmdir calls are needed because older cmd shells