Bad \[...] prototype checking

[perl5.git] / os2 / Makefile.SHs

diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index be5aad1..9c44823 100644 (file)
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -44,6 +44,7 @@ AOUT_CLDFLAGS_DLL     = -Zexe -Zmt -Zcrtdll -Zstack 32000
 SO_CCCMD       = \$(CC) $ccflags \$(OPTIMIZE)
 
 LD_OPT         = \$(OPTIMIZE)
+PERL_DLL_LD_OPT = -Zmap -Zlinker /map
 
 PERL_DLL_BASE  = perl$dll_post
 PERL_DLL       = \$(PERL_DLL_BASE)\$(DLSUFFIX)
@@ -56,8 +57,9 @@ AOUT_EXTRA_LIBS       = $aout_extra_libs
 $spitshell >>Makefile <<'!NO!SUBS!'
 $(LIBPERL): perl.imp $(PERL_DLL) perl5.def libperl_override.lib
        emximp -o $(LIBPERL) perl.imp
+       cp $(LIBPERL) perl.lib
 
-libperl_override.imp: os2/os2add.sym
+libperl_override.imp: os2/os2add.sym miniperl
        ./miniperl -wnle 'print "$$_\t$(PERL_DLL_BASE)\t$$_\t?"' os2/os2add.sym > tmp.imp
        echo    'strdup $(PERL_DLL_BASE)        Perl_strdup     ?' >> tmp.imp
        echo    'putenv $(PERL_DLL_BASE)        Perl_putenv     ?' >> tmp.imp
@@ -90,7 +92,7 @@ t/$(PERL_DLL): $(PERL_DLL)
        $(LNS) $(PERL_DLL) t/$(PERL_DLL)
 
 $(PERL_DLL): $(obj) perl5.def perl$(OBJ_EXT)
-       $(LD) $(LD_OPT) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) $(libs) perl5.def || ( rm $(PERL_DLL) && sh -c false )
+       $(LD) $(LD_OPT) $(LDDLFLAGS) $(PERL_DLL_LD_OPT) -o $@ perl$(OBJ_EXT) $(obj) $(libs) perl5.def || ( rm $(PERL_DLL) && sh -c false )
 
 perl5.olddef: perl.linkexp
        echo "LIBRARY '$(PERL_DLL_BASE)' INITINSTANCE TERMINSTANCE"     > $@
@@ -197,6 +199,7 @@ $(DYNALOADER_OBJ) : $(DYNALOADER)
 $(AOUT_LIBPERL) : $(aout_obj) perl$(AOUT_OBJ_EXT)
        rm -f $@
        $(AOUT_AR) rcu $@ perl$(AOUT_OBJ_EXT) $(aout_obj)
+       cp $@ perl.a
 
 .c$(AOUT_OBJ_EXT):
        $(AOUT_CCCMD) $(PLDLFLAGS) -c $*.c
@@ -218,7 +221,10 @@ miniperl_: $& miniperlmain$(AOUT_OBJ_EXT) $(AOUT_LIBPERL) opmini$(AOUT_OBJ_EXT)
 
 # Forking statically loaded perl
 
-perl_$(EXE_EXT) perl_: $& aout_perlmain$(AOUT_OBJ_EXT) $(AOUT_LIBPERL) $(AOUT_DYNALOADER) $(aout_static_ext) ext.libs
+# Need a miniperl_ dependency, since $(AOUT_DYNALOADER) is build via implicit
+# rules, thus would not rebuild miniperl_ via an explicit rule
+
+perl_$(EXE_EXT) perl_: $& miniperl_ aout_perlmain$(AOUT_OBJ_EXT) $(AOUT_LIBPERL) $(AOUT_DYNALOADER) $(aout_static_ext) ext.libs
        $(CC) $(AOUT_CLDFLAGS) $(CCDLFLAGS) -o perl_ aout_perlmain$(AOUT_OBJ_EXT) $(AOUT_DYNALOADER) $(aout_static_ext) $(AOUT_LIBPERL) `cat ext.libs` $(libs)
 
 # Remove -Zcrtdll
@@ -229,7 +235,9 @@ STAT_AOUT_CLDFLAGS = -Zexe -Zmt -Zstack 32000
 perl_stat_aout$(EXE_EXT) perl_stat_aout: $& perlmain$(AOUT_OBJ_EXT) $(AOUT_DYNALOADER_OBJ) $(aout_static_ext_dll) $(AOUT_LIBPERL_DLL) ext.libs
        $(SHRPENV) $(CC) $(STAT_AOUT_CLDFLAGS) $(CCDLFLAGS) -o $@ perlmain$(AOUT_OBJ_EXT) $(AOUT_DYNALOADER_OBJ) $(aout_static_ext_dll) $(AOUT_LIBPERL_DLL) `cat ext.libs` $(libs)
 
-perl : perl__ perl___
+PERLREXX_DLL = perlrexx.dll
+
+perl : perl__ perl___ $(PERLREXX_DLL)
 
 # Dynamically loaded PM-application perl:
 
@@ -251,7 +259,7 @@ aout_install: perl_ aout_install.perl
 aout_install.perl: perl_ installperl
        ./perl_ installperl
 
-perlrexx: perlrexx.dll
+perlrexx: $(PERLREXX_DLL)
        @sh -c true
 
 perlrexx.c: os2/perlrexx.c
@@ -262,10 +270,10 @@ SO_CLDFLAGS = -Zdll -Zso -Zomf -Zmt -Zsys
 
 # A callable-from-REXX DLL
 
-perlrexx.dll: perlrexx$(OBJ_EXT) perlrexx.def
+$(PERLREXX_DLL): perlrexx$(OBJ_EXT) perlrexx.def
        $(SHRPENV) $(CC) $(SO_CLDFLAGS) $(CCDLFLAGS) -o $@ perlrexx$(OBJ_EXT) $(DYNALOADER) $(static_ext) $(LIBPERL) `cat ext.libs` $(libs) perlrexx.def
 
-perlrexx.def: miniperl \$(_preplibrary)
+perlrexx.def: miniperl $(_preplibrary)
        echo    "LIBRARY 'perlrexx' INITINSTANCE TERMINSTANCE"  > tmp.def
        echo    "DESCRIPTION '@#perl5-porters@perl.org:`miniperl -Ilib -MConfig -e 'print \$$]'`#@ REXX to Perl `miniperl -Ilib -MConfig -e 'print \$$Config{version}'` interface'" >> tmp.def
        echo    "EXPORTS"                                       >> tmp.def
@@ -274,6 +282,11 @@ perlrexx.def: miniperl \$(_preplibrary)
        echo    '  "PERLINIT"'                                  >> tmp.def
        echo    '  "PERLEXIT"'                                  >> tmp.def
        echo    '  "PERLEVAL"'                                  >> tmp.def
+       echo    '  "PERLLASTERROR"'                             >> tmp.def
+       echo    '  "PERLEVALSUBCOMMAND"'                        >> tmp.def
+       echo    '  "PERLEXPORTALL"'                             >> tmp.def
+       echo    '  "PERLDROPALL"'                               >> tmp.def
+       echo    '  "PERLDROPALLEXIT"'                           >> tmp.def
        sh mv-if-diff tmp.def $@
 
 
@@ -440,7 +453,7 @@ lib/auto/*/%.a : ext/%/Makefile.aout
        @cd ext/$(basename $(notdir $@)) ; make -f Makefile.aout config || echo "\$(MAKE) config failed, continuing anyway..."
        cd ext/$(basename $(notdir $@)) ; make -f Makefile.aout LINKTYPE=static CCCDLFLAGS=
 
-ext/%/Makefile.aout : miniperl_ \$(_preplibrary) \$(AOUT_EXTENSIONS_FORCE)
+ext/%/Makefile.aout : miniperl_ $(_preplibrary) $(AOUT_EXTENSIONS_FORCE)
        cd $(dir $@) ; ../../miniperl_ -I ../../lib Makefile.PL FIRST_MAKEFILE=Makefile.aout INSTALLDIRS=perl 
 
 !NO!SUBS!