Add elc target to to makefile

[p5sagit/p5-mst-13.2.git] / os2 / Makefile.SHs

diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index 493aeab..fd3766e 100644 (file)
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -6,9 +6,19 @@
 # Additional rules supported: perl_, aout_test, aout_install, use them
 # for a.out style perl (which may fork).
 
+perl_version="5.00${PATCHLEVEL}_$SUBVERSION"
+case "$archname" in
+ *-thread)     dll_post=_thr 
+               perl_version="${perl_version}-threaded";;
+ *)            dll_post='' ;;
+esac
+
 $spitshell >>Makefile <<!GROK!THIS!
 
-AOUT_CCCMD     = \$(CC) $aout_ccflags $optimize
+PERL_VERSION = $perl_version
+
+AOUT_OPTIMIZE = $optimize
+AOUT_CCCMD     = \$(CC) $aout_ccflags \$(AOUT_OPTIMIZE)
 AOUT_AR                = $aout_ar
 AOUT_OBJ_EXT   = $aout_obj_ext
 AOUT_LIB_EXT   = $aout_lib_ext
@@ -17,17 +27,20 @@ AOUT_CLDFLAGS       = $aout_ldflags
 
 AOUT_LIBPERL_DLL       = libperl_dll$aout_lib_ext
 AOUT_CCCMD_DLL = \$(CC) -DDOSISH -DOS2=2 -DEMBED -I. -DPACK_MALLOC -DDEBUGGING_MSTATS -DTWO_POT_OPTIMIZE -DPERL_EMERGENCY_SBRK
-AOUT_CLDFLAGS_DLL      = -Zexe -Zmt -Zcrtdll
+AOUT_CLDFLAGS_DLL      = -Zexe -Zmt -Zcrtdll -Zstack 32000
 
 LD_OPT         = $optimize
 
+PERL_DLL_BASE  = perl$dll_post
+PERL_DLL       = \$(PERL_DLL_BASE)\$(DLSUFFIX)
+
 !GROK!THIS!
 
 $spitshell >>Makefile <<'!NO!SUBS!'
-$(LIBPERL): perl.imp perl.dll perl5.def
+$(LIBPERL): perl.imp $(PERL_DLL) perl5.def
        emximp -o $(LIBPERL) perl.imp
 
-$(AOUT_LIBPERL_DLL): perl.imp perl.dll perl5.def
+$(AOUT_LIBPERL_DLL): perl.imp $(PERL_DLL) perl5.def
        emximp -o $(AOUT_LIBPERL_DLL) perl.imp
 
 perl.imp: perl5.def
@@ -37,26 +50,16 @@ perl.imp: perl5.def
        echo    'emx_malloc             emxlibcm        402     ?' >> $@
        echo    'emx_realloc            emxlibcm        403     ?' >> $@
 
-perl.dll: $(obj) perl5.def perl$(OBJ_EXT)
+$(PERL_DLL): $(obj) perl5.def perl$(OBJ_EXT)
        $(LD) $(LD_OPT) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) $(libs) perl5.def
 
 perl5.def: perl.linkexp
-       echo "LIBRARY 'Perl' INITINSTANCE TERMINSTANCE" > $@
-       echo DESCRIPTION "'Perl interpreter, export autogenerated'"     >>$@
+       echo "LIBRARY '$(PERL_DLL_BASE)' INITINSTANCE TERMINSTANCE"     > $@
+       echo DESCRIPTION "'Perl interpreter v$(PERL_VERSION), export autogenerated'"    >>$@
        echo STACKSIZE 32768                            >>$@
        echo CODE LOADONCALL                            >>$@
        echo DATA LOADONCALL NONSHARED MULTIPLE         >>$@
        echo EXPORTS                                    >>$@
-       echo '  "ctermid"'                              >>$@
-       echo '  "get_sysinfo"'                          >>$@
-       echo '  "Perl_OS2_init"'                        >>$@
-       echo '  "OS2_Perl_data"'                        >>$@
-       echo '  "dlopen"'                               >>$@
-       echo '  "dlsym"'                                >>$@
-       echo '  "dlerror"'                              >>$@
-       echo '  "my_tmpfile"'                           >>$@
-       echo '  "my_tmpnam"'                            >>$@
-       echo '  "my_flock"'                             >>$@
 !NO!SUBS!
 
 if [ ! -z "$myttyname" ] ; then
@@ -77,8 +80,8 @@ perl.exports: perl.exp EXTERN.h perl.h
                $(CC) -DEMBED  -E - | \
                awk '{if ($$2 == "") print $$1}' | sort | uniq > $@
 
-perl.linkexp: perl.exports perl.map
-       cat perl.exports perl.map | sort | uniq -d | sed -e 's/\w\+/  "\0"/' > perl.linkexp
+perl.linkexp: perl.exports perl.map  os2/os2.sym
+       cat perl.exports os2/os2.sym perl.map | sort | uniq -d | sed -e 's/\w\+/  "\0"/' > perl.linkexp
 
 # We link miniperl statically, since .DLL depends on $(DYNALOADER) 
 
@@ -88,22 +91,25 @@ perl.map miniperl: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT)
        rm miniperl.map
        @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
 
-depend: os2ish.h dlfcn.h 
+depend: os2ish.h dlfcn.h os2thread.h os2.c
 
 # Stupid make? Needed...
 os2$(OBJ_EXT) : os2.c
 
 os2.c: os2/os2.c os2ish.h
-       cp $< $@
+       cp -f $< $@
 
 dl_os2.c: os2/dl_os2.c os2ish.h
-       cp $< $@
+       cp -f $< $@
 
 os2ish.h: os2/os2ish.h
-       cp $< $@
+       cp -f $< $@
+
+os2thread.h: os2/os2thread.h
+       cp -f $< $@
 
 dlfcn.h: os2/dlfcn.h
-       cp $< $@
+       cp -f $< $@
 
 # This one is compiled OMF, so cannot fork():