diff options
| author | Ilya Zakharevich <ilya@math.berkeley.edu> | 1998-04-03 20:39:03 -0500 |
|---|---|---|
| committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1998-05-14 14:47:29 +0000 |
| commit | 3aefca0416eab0f2104345964c03107793baf1d6 (patch) | |
| tree | 5203fb60a3e6c05dd90a6fe0ce19d84517b07b61 /os2/Makefile.SHs | |
| parent | ecbaadc1f9d5bbebf204a971c75e312b0e7fa9ae (diff) | |
| download | perl-3aefca0416eab0f2104345964c03107793baf1d6.tar.gz | |
[PATCH 5.004_64] anydbm.t
Date: Sat, 4 Apr 1998 01:39:03 -0500 (EST)
Subject: [PATCH 5.004_64] threads on OS/2
Date: Sat, 4 Apr 1998 01:44:29 -0500 (EST)
Subject: [PATCH 5.004_64] Better handling of Perl DLLs under OS/2
Date: Sat, 4 Apr 1998 01:47:58 -0500 (EST)
Subject: [PATCH 5.004_64] Immediate stop in debugger
Date: Sat, 11 Apr 1998 19:50:58 -0400 (EDT)
Subject: [PATCH 5.005_64] ptags broken
Date: Sat, 11 Apr 1998 22:08:21 -0400 (EDT)
Subject: [PATCH 5.004_64] Document switch syntax via RE
Date: Sun, 12 Apr 1998 01:12:33 -0400 (EDT)
p4raw-id: //depot/perl@941
Diffstat (limited to 'os2/Makefile.SHs')
| -rw-r--r-- | os2/Makefile.SHs | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index 57d42602e9..4ba7a7fd1f 100644 --- a/os2/Makefile.SHs +++ b/os2/Makefile.SHs @@ -6,8 +6,17 @@ # 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! +PERL_VERSION = $perl_version + AOUT_OPTIMIZE = $optimize AOUT_CCCMD = \$(CC) $aout_ccflags \$(AOUT_OPTIMIZE) AOUT_AR = $aout_ar @@ -22,13 +31,16 @@ AOUT_CLDFLAGS_DLL = -Zexe -Zmt -Zcrtdll 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 @@ -38,12 +50,12 @@ 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 >>$@ @@ -68,7 +80,7 @@ perl.exports: perl.exp EXTERN.h perl.h $(CC) -DEMBED -E - | \ awk '{if ($$2 == "") print $$1}' | sort | uniq > $@ -perl.linkexp: perl.exports perl.map +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) |