# version of 8.x can.)
.IF "$(CCTYPE)" == "MSVC60" || "$(CCTYPE)" == "MSVC70" \
"$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE"
-DELAYLOAD *= -DELAYLOAD:ws2_32.dll -DELAYLOAD:shell32.dll delayimp.lib
+DELAYLOAD *= -DELAYLOAD:ws2_32.dll delayimp.lib
.ENDIF
# Visual C++ 2005 (VC++ 8.x) creates manifest files for EXEs and DLLs. These
EXTRACFLAGS =
CFLAGS = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
$(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" \
+LINK_FLAGS = $(LINK_DBG) -x -L"$(INST_COREDIR)" -L"$(CCLIBDIR)" \
-L"$(CCLIBDIR)\PSDK"
OBJOUT_FLAG = -o
EXEOUT_FLAG = -e
#################### do not edit below this line #######################
############# NO USER-SERVICEABLE PARTS BEYOND THIS POINT ##############
-# Some dmake's built with Borland C++, including Sarathy's one at:
-# http://search.cpan.org/CPAN/authors/id/G/GS/GSAR/dmake-4.1pl1-win32.zip
-# require backslashes to be doubled-up when written to $(mktmp) files.
-# Other dmake's do not require this and would actually output a double
-# backslash if they were doubled-up.
-.IF "$(shell @type $(mktmp \\))"=="\\"
-B=\\
+# Some old dmakes (including Sarathy's one at
+# http://search.cpan.org/CPAN/authors/id/G/GS/GSAR/dmake-4.1pl1-win32.zip)
+# don't support logical OR (||) or logical AND (&&) in conditional
+# expressions and hence don't process this makefile correctly. Determine
+# whether this is the case so that we can give the user an error message.
+.IF 1 == 1 || 1 == 1
+NEWDMAKE = define
.ELSE
-B=\\\
-.ENDIF
-
-# There is a related issue with other escape sequences: Sarathy's old
-# dmake automatically maps escape sequences like \n to their ASCII values
-# when used in macros, while other dmake's only do so if this behaviour
-# is explicitly requested with the :m modifier.
-DONTUSETHIS=\n
-.IF "$(shell @type $(mktmp \n))"=="\n"
-N=$(DONTUSETHIS:m)
-.ELSE
-N=$(DONTUSETHIS)
+NEWDMAKE = undef
.ENDIF
o *= .obj
.rc.res:
.IF "$(CCTYPE)" == "GCC"
- $(RSC) --use-temp-file -I . -I .. -O COFF -i $< -o $@
+ $(RSC) --use-temp-file --include-dir=. --include-dir=.. -O COFF -i $< -o $@
.ELSE
$(RSC) -i.. $<
.ENDIF
CONFIGPM = ..\lib\Config.pm ..\lib\Config_heavy.pl
MINIMOD = ..\lib\ExtUtils\Miniperl.pm
X2P = ..\x2p\a2p.exe
+GENUUDMAP = ..\generate_uudmap.exe
.IF "$(BUILD_STATIC)" == "define"
PERLSTATIC = static
.ELSE
..\EXTERN.h \
..\perlvars.h \
..\intrpvar.h \
- ..\thrdvar.h \
.\include\dirent.h \
.\include\netdb.h \
.\include\sys\socket.h \
CORE_H = $(CORE_NOCFG_H) .\config.h
+UUDMAP_H = ..\uudmap.h
+
MICROCORE_OBJ = $(MICROCORE_SRC:db:+$(o))
CORE_OBJ = $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
WIN32_OBJ = $(WIN32_SRC:db:+$(o))
MINI_OBJ = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
DLL_OBJ = $(DLL_SRC:db:+$(o))
X2P_OBJ = $(X2P_SRC:db:+$(o))
+GENUUDMAP_OBJ = $(GENUUDMAP:db:+$(o))
PERLDLL_OBJ = $(CORE_OBJ)
PERLEXE_OBJ = perlmain$(o)
# -- BKS 10-17-1999
CFG_VARS = \
INST_DRV=$(INST_DRV) ~ \
- INST_TOP=$(INST_TOP:s,\,$B,) ~ \
- INST_VER=$(INST_VER:s,\,$B,) ~ \
+ INST_TOP=$(INST_TOP) ~ \
+ INST_VER=$(INST_VER) ~ \
INST_ARCH=$(INST_ARCH) ~ \
archname=$(ARCHNAME) ~ \
cc=$(CC) ~ \
d_crypt=$(D_CRYPT) ~ \
d_mymalloc=$(PERL_MALLOC) ~ \
libs=$(LIBFILES:f) ~ \
- incpath=$(CCINCDIR:s,\,$B,) ~ \
+ incpath=$(CCINCDIR) ~ \
libperl=$(PERLIMPLIB:f) ~ \
- libpth=$(CCLIBDIR:s,\,$B,);$(EXTRALIBDIRS:s,\,$B,) ~ \
+ libpth=$(CCLIBDIR);$(EXTRALIBDIRS) ~ \
libc=$(LIBC) ~ \
make=dmake ~ \
_o=$(o) ~ \
useperlio=$(USE_PERLIO) ~ \
uselargefiles=$(USE_LARGE_FILES) ~ \
usesitecustomize=$(USE_SITECUST) ~ \
- LINK_FLAGS=$(LINK_FLAGS:s,\,$B,) ~ \
+ LINK_FLAGS=$(LINK_FLAGS) ~ \
optimize=$(OPTIMIZE)
#
# Top targets
#
-all : .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \
+all : CHECKDMAKE .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \
$(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
$(X2P) MakePPPort Extensions $(PERLSTATIC)
-..\regnodes.h : ..\regcomp.sym
+..\regnodes.h : ..\regcomp.sym ..\regcomp.pl ..\regexp.h
cd .. && regcomp.pl && cd win32
+..\regcharclass.h : ..\Porting\regcharclass.pl
+ cd .. && Porting\regcharclass.pl && cd win32
+
regnodes : ..\regnodes.h
+..\regcomp$(o) : ..\regnodes.h ..\regcharclass.h
+
+..\regexec$(o) : ..\regnodes.h ..\regcharclass.h
+
reonly : regnodes .\config.h $(GLOBEXE) $(MINIPERL) $(MK2) \
$(RIGHTMAKE) $(MINIMOD) $(CONFIGPM) $(UNIDATAFILES) $(PERLEXE) \
$(X2P) Extensions_reonly
__not_needed:
$(NOOP)
+CHECKDMAKE :
+.IF "$(NEWDMAKE)" == "define"
+ $(NOOP)
+.ELSE
+ @echo Your dmake doesn't support ^|^| or ^&^& in conditional expressions.
+ @echo Please get the latest dmake from http://search.cpan.org/dist/dmake/
+ @exit 1
+.ENDIF
+
$(GLOBEXE) : perlglob$(o)
.IF "$(CCTYPE)" == "BORLAND"
$(CC) -c -w -v -tWM -I"$(CCINCDIR)" perlglob.c
if not exist $(CCLIBDIR)\PSDK\odbccp32.lib \
cd $(CCLIBDIR)\PSDK && implib odbccp32.lib $(ODBCCP32_DLL)
$(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(MINI_OBJ:s,\,$B,),$(@:s,\,$B,),,$(LIBFILES),)
+ @$(mktmp c0x32$(o) $(MINI_OBJ),$@,,$(LIBFILES),)
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -v -mconsole -o $@ $(BLINK_FLAGS) \
- $(mktmp $(LKPRE) $(MINI_OBJ:s,\,$B,) $(LIBFILES) $(LKPOST))
+ $(mktmp $(LKPRE) $(MINI_OBJ) $(LIBFILES) $(LKPOST))
.ELSE
$(LINK32) -subsystem:console -out:$@ $(BLINK_FLAGS) \
- @$(mktmp $(LIBFILES) $(MINI_OBJ:s,\,$B,))
+ @$(mktmp $(LIBFILES) $(MINI_OBJ))
$(EMBED_EXE_MANI)
.ENDIF
$(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static
.IF "$(CCTYPE)" == "BORLAND"
$(LINK32) -Tpd -ap $(BLINK_FLAGS) \
- @$(mktmp c0d32$(o) $(PERLDLL_OBJ:s,\,$B,)$N \
- $(@:s,\,$B,),$N \
- $(subst,\,$B $(shell @type Extensions_static)) $(LIBFILES)$N \
- perldll.def$N)
+ @$(mktmp c0d32$(o) $(PERLDLL_OBJ),$@,, \
+ $(shell @type Extensions_static) $(LIBFILES),perldll.def)
$(IMPLIB) $*.lib $@
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -mdll -o $@ -Wl,--base-file -Wl,perl.base $(BLINK_FLAGS) \
- $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \
- $(subst,\,$B $(shell @type Extensions_static)) \
- $(LIBFILES) $(LKPOST))
+ $(mktmp $(LKPRE) $(PERLDLL_OBJ) \
+ $(shell @type Extensions_static) \
+ $(LIBFILES) $(LKPOST))
dlltool --output-lib $(PERLIMPLIB) \
--dllname $(PERLDLL:b).dll \
--def perldll.def \
--base-file perl.base \
--output-exp perl.exp
$(LINK32) -mdll -o $@ $(BLINK_FLAGS) \
- $(mktmp $(LKPRE) $(PERLDLL_OBJ:s,\,$B,) \
- $(subst,\,$B $(shell @type Extensions_static)) \
- $(LIBFILES) perl.exp $(LKPOST))
+ $(mktmp $(LKPRE) $(PERLDLL_OBJ) \
+ $(shell @type Extensions_static) \
+ $(LIBFILES) perl.exp $(LKPOST))
.ELSE
$(LINK32) -dll -def:perldll.def -out:$@ $(BLINK_FLAGS) \
@Extensions_static \
@$(mktmp -base:0x28000000 $(DELAYLOAD) $(LIBFILES) \
- $(PERLDLL_RES:s,\,$B,) $(PERLDLL_OBJ:s,\,$B,))
+ $(PERLDLL_RES) $(PERLDLL_OBJ))
$(EMBED_DLL_MANI)
.ENDIF
$(XCOPY) $(PERLIMPLIB) $(COREDIR)
$(PERLSTATICLIB): Extensions_static
.IF "$(CCTYPE)" == "BORLAND"
$(LIB32) $(LIB_FLAGS) $@ \
- @$(mktmp $(subst,\,$B $(shell @type Extensions_static)) \
- $(PERLDLL_OBJ:s,\,$B,))
+ @$(mktmp $(shell @type Extensions_static) \
+ $(PERLDLL_OBJ))
.ELIF "$(CCTYPE)" == "GCC"
# XXX: It would be nice if MinGW's ar accepted a temporary file, but this
# doesn't seem to work:
# $(LIB32) $(LIB_FLAGS) $@ \
-# $(mktmp $(LKPRE) $(subst,\,$B $(shell @type Extensions_static)) \
-# $(PERLDLL_OBJ:s,\,$B,) $(LKPOST))
+# $(mktmp $(LKPRE) $(shell @type Extensions_static) \
+# $(PERLDLL_OBJ) $(LKPOST))
$(LIB32) $(LIB_FLAGS) $@ \
- $(subst,\,$B $(shell @type Extensions_static)) \
- $(PERLDLL_OBJ:s,\,$B,)
+ $(shell @type Extensions_static) \
+ $(PERLDLL_OBJ)
.ELSE
$(LIB32) $(LIB_FLAGS) -out:$@ @Extensions_static \
- @$(mktmp $(PERLDLL_OBJ:s,\,$B,))
+ @$(mktmp $(PERLDLL_OBJ))
.ENDIF
$(XCOPY) $(PERLSTATICLIB) $(COREDIR)
$(MINIPERL) ..\x2p\s2p.PL
.IF "$(CCTYPE)" == "BORLAND"
$(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(X2P_OBJ:s,\,$B,),$(@:s,\,$B,),,$(LIBFILES),)
+ @$(mktmp c0x32$(o) $(X2P_OBJ),$@,,$(LIBFILES),)
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -v -o $@ $(BLINK_FLAGS) \
- $(mktmp $(LKPRE) $(X2P_OBJ:s,\,$B,) $(LIBFILES) $(LKPOST))
+ $(mktmp $(LKPRE) $(X2P_OBJ) $(LIBFILES) $(LKPOST))
.ELSE
$(LINK32) -subsystem:console -out:$@ $(BLINK_FLAGS) \
- @$(mktmp $(LIBFILES) $(X2P_OBJ:s,\,$B,))
+ @$(mktmp $(LIBFILES) $(X2P_OBJ))
$(EMBED_EXE_MANI)
.ENDIF
-globals$(o) : uudmap.h
+$(MINIDIR)\globals$(o) : $(UUDMAP_H)
-uudmap.h: generate_uudmap.exe
- generate_uudmap >uudmap.h
+$(UUDMAP_H) : $(GENUUDMAP)
+ $(GENUUDMAP) >$(UUDMAP_H)
-generate_uudmap.exe : generate_uudmap$(o)
+$(GENUUDMAP) : $(GENUUDMAP_OBJ)
.IF "$(CCTYPE)" == "BORLAND"
$(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) generate_uudmap$(o),$(@:s,\,$B,),,$(LIBFILES),)
+ @$(mktmp c0x32$(o) $(GENUUDMAP_OBJ),$@,,$(LIBFILES),)
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -v -o $@ $(BLINK_FLAGS) \
- $(mktmp $(LKPRE) generate_uudmap$(o) $(LIBFILES) $(LKPOST))
+ $(mktmp $(LKPRE) $(GENUUDMAP_OBJ) $(LIBFILES) $(LKPOST))
.ELSE
$(LINK32) -subsystem:console -out:$@ $(BLINK_FLAGS) \
- @$(mktmp $(LIBFILES) generate_uudmap$(o))
+ @$(mktmp $(LIBFILES) $(GENUUDMAP_OBJ))
+ $(EMBED_EXE_MANI)
.ENDIF
perlmain.c : runperl.c
copy runperl.c perlmain.c
perlmain$(o) : perlmain.c
- $(CC) $(CFLAGS_O) -UPERLDLL $(OBJOUT_FLAG)$@ -c perlmain.c
+ $(CC) $(CFLAGS_O:s,-DPERLDLL,-UPERLDLL,) $(OBJOUT_FLAG)$@ -c perlmain.c
perlmainst.c : runperl.c
copy runperl.c perlmainst.c
perlmainst$(o) : perlmainst.c
- $(CC) $(CFLAGS_O) -DPERLDLL $(OBJOUT_FLAG)$@ -c perlmainst.c
+ $(CC) $(CFLAGS_O) $(OBJOUT_FLAG)$@ -c perlmainst.c
$(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
.IF "$(CCTYPE)" == "BORLAND"
$(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(PERLEXE_OBJ:s,\,$B,)$N \
- $(@:s,\,$B,),$N \
- $(PERLIMPLIB:s,\,$B,) $(LIBFILES),$N \
- $(PERLEXE_RES:s,\,$B,)$N)
+ @$(mktmp c0x32$(o) $(PERLEXE_OBJ),$@,, \
+ $(PERLIMPLIB) $(LIBFILES),,$(PERLEXE_RES))
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \
$(PERLEXE_OBJ) $(PERLEXE_RES) $(PERLIMPLIB) $(LIBFILES)
$(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES)
.IF "$(CCTYPE)" == "BORLAND"
$(LINK32) -Tpe -ap $(BLINK_FLAGS) \
- @$(mktmp c0x32$(o) $(PERLEXEST_OBJ:s,\,$B,)$N \
- $(@:s,\,$B,),$N \
- $(subst,\,$B $(shell @type Extensions_static)) \
- $(PERLSTATICLIB:s,\,$B,) $(LIBFILES),$N \
- $(PERLEXE_RES:s,\,$B,)$N)
+ @$(mktmp c0x32$(o) $(PERLEXEST_OBJ),$@,, \
+ $(shell @type Extensions_static) $(PERLSTATICLIB) $(LIBFILES),, \
+ $(PERLEXE_RES))
.ELIF "$(CCTYPE)" == "GCC"
$(LINK32) -mconsole -o $@ $(BLINK_FLAGS) \
- $(mktmp $(LKPRE) $(subst,\,$B $(shell @type Extensions_static)) \
- $(PERLSTATICLIB:s,\,$B,) $(LIBFILES) $(PERLEXEST_OBJ) \
- $(PERLEXE_RES:s,\,$B,) $(LKPOST))
+ $(mktmp $(LKPRE) $(shell @type Extensions_static) \
+ $(PERLSTATICLIB) $(LIBFILES) $(PERLEXEST_OBJ) \
+ $(PERLEXE_RES) $(LKPOST))
.ELSE
$(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(BLINK_FLAGS) \
@Extensions_static $(PERLSTATICLIB) \
-del /f $(LIBDIR)\PerlIO\scalar.pm
-del /f $(LIBDIR)\PerlIO\via.pm
-del /f $(LIBDIR)\Sys\Hostname.pm
- -del /f $(LIBDIR)\Thread\Signal.pm $(LIBDIR)\Thread\Specific.pm
-del /f $(LIBDIR)\threads\shared.pm
-del /f $(LIBDIR)\Time\HiRes.pm
-del /f $(LIBDIR)\Unicode\Normalize.pm
-del /f bin\*.bat
-del /f perllibst.h
-del /f $(PERLEXE_ICO) perl.base
- ren ..\lib\Net\Changes.libnet Changes.tenbil
- ren ..\lib\Net\README.libnet README.tenbil
-cd .. && del /s *$(a) *.map *.pdb *.ilk *.tds *.bs *$(o) .exists pm_to_blib
- ren ..\lib\Net\Changes.tenbil Changes.libnet
- ren ..\lib\Net\README.tenbil README.libnet
-cd $(EXTDIR) && del /s *.def Makefile Makefile.old
-if exist $(AUTODIR) rmdir /s /q $(AUTODIR)
-if exist $(COREDIR) rmdir /s /q $(COREDIR)
-@erase $(PERLSTATICLIB)
-@erase $(PERLDLL)
-@erase $(CORE_OBJ)
- -@erase generate_uudmap.exe generate_uudmap$(o) uudmap.h
+ -@erase $(GENUUDMAP) $(GENUUDMAP_OBJ) $(UUDMAP_H)
-if exist $(MINIDIR) rmdir /s /q $(MINIDIR)
-if exist $(UNIDATADIR1) rmdir /s /q $(UNIDATADIR1)
-if exist $(UNIDATADIR2) rmdir /s /q $(UNIDATADIR2)
-@erase $(WIN32_OBJ)
-@erase $(DLL_OBJ)
-@erase $(X2P_OBJ)
- ren ..\lib\Net\Changes.libnet Changes.tenbil
- ren ..\lib\Net\README.libnet README.tenbil
-@erase ..\*$(o) ..\*$(a) ..\*.exp *$(o) *$(a) *.exp *.res
- ren ..\lib\Net\Changes.tenbil Changes.libnet
- ren ..\lib\Net\README.tenbil README.libnet
-@erase ..\t\*.exe ..\t\*.dll ..\t\*.bat
-@erase ..\x2p\*.exe ..\x2p\*.bat
-@erase *.ilk