summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Zakharevich <ilya@math.berkeley.edu>2003-11-03 12:20:44 -0800
committerNicholas Clark <nick@ccl4.org>2003-11-04 21:54:48 +0000
commitebd04b35720fb0387cad4697f7c6b8c8035a067b (patch)
tree2fb766b1360f1118ca732c2349eb5deaf63c332e
parente4bd4d4a5d5786facf088988b9be40364df64042 (diff)
downloadperl-ebd04b35720fb0387cad4697f7c6b8c8035a067b.tar.gz
Integrate:
[ 21651] Subject: Re: [PATCH 5.8.2 @21574] OS/2 build Message-ID: <20031104042044.GA1682@math.berkeley.edu> p4raw-link: @21651 on //depot/perl: 8ee276f395d4f9dd37add3f06a414b9925af5591 p4raw-id: //depot/maint-5.8/perl@21653 p4raw-integrated: from //depot/perl@21649 'copy in' os2/Makefile.SHs (@21620..)
-rw-r--r--os2/Makefile.SHs4
1 files changed, 2 insertions, 2 deletions
diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index 87f0b37093..2a098c95bc 100644
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -207,7 +207,7 @@ installcmd :
aout_obj = $(addsuffix $(AOUT_OBJ_EXT),$(basename $(obj)))
AOUT_DYNALOADER = $(addsuffix $(AOUT_LIB_EXT),$(basename $(DYNALOADER)))
-aout_ext = $(dynamic_ext) $(AOUT_EXTRA_LIBS)
+aout_ext = $(static_ext) $(dynamic_ext) $(AOUT_EXTRA_LIBS)
aout_static_ext = $(addsuffix $(AOUT_LIB_EXT),$(basename $(aout_ext)))
aout_static_lib = $(addsuffix $(LIB_EXT),$(basename $(aout_ext)))
@@ -237,7 +237,7 @@ perlmain(AOUT_OBJ_EXT): perlmain.c
$(AOUT_CCCMD_DLL) $(PLDLFLAGS) -c perlmain.c
# Assume that extensions are at most 4 deep (this is so with 5.8.1)
-aout_extlist: $(aout_static_ext)
+aout_extlist: $(aout_static_ext) $(AOUT_DYNALOADER)
echo lib/auto/*.a lib/auto/*/*.a lib/auto/*/*/*.a lib/auto/*/*/*/*.a | tr ' ' '\n' | grep -v '\*' > $@.tmp
sh mv-if-diff $@.tmp $@