win32 tweaks

[p5sagit/p5-mst-13.2.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index f2d9b82..050e471 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -177,6 +177,9 @@ ARCHOBJS = $archobjs
 # grrr
 SHELL = $sh
 
+# how to tr(anslate) newlines
+TRNL = '$trnl'
+
 !GROK!THIS!
 
 ## In the following dollars and backticks do not need the extra backslash.
@@ -206,7 +209,7 @@ addedbyconf = UU $(shextract) $(plextract) pstruct
 h1 = EXTERN.h INTERN.h XSUB.h av.h config.h cop.h cv.h dosish.h
 h2 = embed.h form.h gv.h handy.h hv.h keywords.h mg.h op.h
 h3 = opcode.h patchlevel.h perl.h perly.h pp.h proto.h regcomp.h
-h4 = regexp.h scope.h sv.h unixish.h util.h perlio.h thread.h
+h4 = regexp.h scope.h sv.h unixish.h util.h iperlsys.h thread.h
 h5 = bytecode.h byterun.h
 h = $(h1) $(h2) $(h3) $(h4) $(h5)
 
@@ -238,7 +241,8 @@ lintflags = -hbvxac
        $(CCCMD) $(PLDLFLAGS) $*.c
 
 all: $(FIRSTMAKEFILE) miniperl $(private) $(plextract) $(public) $(dynamic_ext) $(nonxs_ext)
-       @echo " "; echo "       Everything is up to date."
+       @echo " ";
+       @echo " Everything is up to date. 'make test' to run test suite."
 
 compile: all
        echo "testing compilation" > testcompile;
@@ -299,6 +303,7 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj)
                case "$osname" in
                aix)
                        $spitshell >>Makefile <<'!NO!SUBS!'
+       rm -f libperl$(OBJ_EXT)
        mv $@ libperl$(OBJ_EXT)
        $(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
 !NO!SUBS!
@@ -327,7 +332,7 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj)
 
 miniperl: $& miniperlmain$(OBJ_EXT) $(LIBPERL)
        $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(LLIBPERL) $(libs)
-       @ $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
+       $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
 
 perl: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs
        $(SHRPENV) $(LDLIBPTH) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs)
@@ -367,7 +372,7 @@ sperl$(OBJ_EXT): perl.c perly.h patchlevel.h $(h)
 preplibrary: miniperl lib/Config.pm $(plextract)
        @sh ./makedir lib/auto
        @echo " AutoSplitting perl library"
-       @$(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
+       $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \
                autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm
 
 # Take care to avoid modifying lib/Config.pm without reason
@@ -375,12 +380,17 @@ preplibrary: miniperl lib/Config.pm $(plextract)
 # try 'make minitest' and/or commenting out the tests at the end of configpm.)
 lib/Config.pm: config.sh miniperl configpm
        $(LDLIBPTH) ./miniperl configpm tmp
-       sh mv-if-diff tmp lib/Config.pm
+       sh mv-if-diff tmp $@
 
 lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl minimod.pl lib/Config.pm
-       $(LDLIBPTH) ./miniperl minimod.pl > tmp && mv tmp $@
+       $(LDLIBPTH) ./miniperl minimod.pl > tmp
+       sh mv-if-diff tmp $@
+
+lib/re.pm: ext/re/re.pm
+       rm -f $@
+       cat ext/re/re.pm > $@
 
-$(plextract):  miniperl lib/Config.pm
+$(plextract):  miniperl lib/Config.pm lib/re.pm
        $(LDLIBPTH) ./miniperl -Ilib $@.PL
        
 install: all install.perl install.man
@@ -391,6 +401,7 @@ install.perl:       all installperl
                cd utils; $(MAKE) compile; \
                cd ../x2p; $(MAKE) compile; \
                cd ../pod; $(MAKE) compile; \
+       else :; \
        fi
        $(LDLIBPTH) ./perl installperl
 
@@ -576,7 +587,7 @@ test-notty: test-prep
 
 # Can't depend on lib/Config.pm because that might be where miniperl
 # is crashing.
-minitest: miniperl
+minitest: miniperl lib/re.pm
        @echo "You may see some irrelevant test failures if you have been unable"
        @echo "to build lib/Config.pm."
        - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \
@@ -589,20 +600,23 @@ minitest: miniperl
 ok:    utilities
        $(LBLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)'
 
+okfile:        utilities
+       $(LBLIBPTH) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok
+
 nok:   utilities
        $(LBLIBPTH) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)'
 
 clist: $(c)
-       echo $(c) | tr ' ' '\012' >.clist
+       echo $(c) | tr ' ' $(TRNL) >.clist
 
 hlist:  $(h)
-       echo $(h) | tr ' ' '\012' >.hlist
+       echo $(h) | tr ' ' $(TRNL) >.hlist
 
 shlist: $(sh)
-       echo $(sh) | tr ' ' '\012' >.shlist
+       echo $(sh) | tr ' ' $(TRNL) >.shlist
 
 pllist: $(pl)
-       echo $(pl) | tr ' ' '\012' >.pllist
+       echo $(pl) | tr ' ' $(TRNL) >.pllist
 
 Makefile: Makefile.SH ./config.sh
        $(SHELL) Makefile.SH
@@ -610,7 +624,12 @@ Makefile: Makefile.SH ./config.sh
 distcheck: FORCE
        perl '-MExtUtils::Manifest=&fullcheck' -e 'fullcheck()'
 
-etags:
+elc:   emacs/cperl-mode.elc
+
+emacs/cperl-mode.elc: emacs/cperl-mode.el
+       -cd emacs; emacs -batch -q -no-site-file -f batch-byte-compile cperl-mode.el
+
+etags: emacs/cperl-mode.elc
        sh emacs/ptags
 
 # AUTOMATICALLY GENERATED MAKE DEPENDENCIES--PUT NOTHING BELOW THIS LINE