summaryrefslogtreecommitdiff
path: root/Makefile.SH
diff options
context:
space:
mode:
authorAndy Dougherty <doughera@lafcol.lafayette.edu>1995-01-26 00:40:50 +0000
committerAndy Dougherty <doughera@lafcol.lafayette.edu>1995-01-26 00:40:50 +0000
commit75f926282bd78abe2f394977be7dd4dc52cb21ba (patch)
treefd86369fb52a5fa00387d1ce65c7086f0ac41b94 /Makefile.SH
parent420218e7eb4fa5ceefe298e6d9121548b8d806d6 (diff)
downloadperl-75f926282bd78abe2f394977be7dd4dc52cb21ba.tar.gz
perl5.000 patch.0i: fix glaring mistakes in patches a-h
This patch does the following things: 1. Fix various bonehead errors I introduced in patches a-g. 2. Incorporate MakeMaker changes to bring it up to version 4.01 (mostly). 3. Stick in things I forgot in patches a-g (e.g. AIX). 4. Some minor additional cleanup in x2p/ for even pickier compilers. 5. More hints updates (hpux and next). 6. Include newest dl_hpux.xs. I didn't have time to 1. Fix the overlapping strcpy() in op.c 2. Restore h2xs to Larry's original design to process <>. 3. take out unnecessary "use Config" in installperl. 4. Add in vms patches. I forgot to [If I remembered what i forgot, I wouldn't have forgotten it. :] I deliberately decided *not* to 1. Touch pod/* 2. deal with overloading Specifically, here's what's included: Configure Regenerated to be sure it's up-to-date. Makefile.SH Build extension libraries right into lib/auto/whatever. Don't set CCCDLFLAGS since we don't use it anyway. Take care to avoid modifying lib/Config.pm without reason Visit DynaLoader for `make clean'. (Previously only did so for `make realclean'.) @echo "Note that make realclean does not delete config.sh" Include config.h dependency. U/i_db.U config_h.SH config.H Remove unwanted quotes around db_hashtype and db_prefixtype. configpm Allow specification of alternate name for lib/Config.pm, so the makefile mv-if-diff trick saves needless re-making. ext/DynaLoader/DynaLoader.pm Updated warning messages and comments. ext/DynaLoader/dl_hpux.xs Updated to version 2.1. Now uses bootstrap files. ext/util/make_ext Explicitly use #!/bin/sh to start it up. This is useful for testing make_ext. Improve & simplify Nested::Extension::Processing. More robust handling of `make clean'. hints/hpux_9.sh Support both the bundled and unbundled compilers. hints/next_3_2.sh Back to using -posix rather than POSIX_SOURCE. And that only for ext/POSIX/POSIX.xs. installperl Special ranlib treatment for NeXT, which gets confused about timestamps in libraries, even when you just copy the library. Supply missing '$' in samepath() function. lib/AutoSplit.pm New parameters. lib/ExtUtils/MakeMaker.pm Upgraded from 3.8 to 4.01. lib/ExtUtils/xsubpp Documentation changed from man to pod. lib/Getopt/Long.pm Avoid typo warning. Drop unused $optx. lib/Text/Tabs.pm Fix package name. makedepend.SH Explicitly start with $startsh. Catch cpp that prints # <stdin> instead of line numbers. perl.h Fix bonehead mistake that ended up calling my_fmod even if not needed. perl_exp.SH also add symbols from interp.sym proto.h Delete 2 redundant prototypes (newBINOP and newUNOP). util.c Add (char *) casts to unsigned char args to bcmp. x2p/a2p.h Rearrange order of <string?.h> and bcopy & bzero stuff. Change a few function prototypes to void, to reflect actual usage. x2p/a2py.c Change a few function types to void, to reflect actual usage. x2p/handy.h Make *alloc declarations match those in x2p/util.c. x2p/util.c Make *alloc declarations match those in x2p/handy.h. x2p/walk.c Add a (Size_t) cast for comparison of 1 to the result of strlen(). Thanks to all who's work is included here. Little of it is mine.
Diffstat (limited to 'Makefile.SH')
-rw-r--r--Makefile.SH18
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.SH b/Makefile.SH
index b3e5e04cf1..9bfc035a8f 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -51,14 +51,14 @@ dynamic_list=' '
for f in $dynamic_ext; do
: the dependency named here will never exist
base=`echo "$f" | sed 's/.*\///'`
- dynamic_list="$dynamic_list ext/$f/$base.$dlext"
+ dynamic_list="$dynamic_list lib/auto/$f/$base.$dlext"
done
static_list=' '
static_ai_list=' '
for f in $static_ext; do
base=`echo "$f" | sed 's/.*\///'`
- static_list="$static_list ext/$f/$base.a"
+ static_list="$static_list lib/auto/$f/$base.a"
if test -f ext/$f/AutoInit.c; then
static_ai_list="$static_ai_list ext/$f/AutoInit.c"
fi
@@ -102,7 +102,6 @@ ranlib = $ranlib
# dynamic loading.
LDDLFLAGS = $lddlflags
CCDLFLAGS = $ccdlflags
-CCCDLFLAGS = $cccdlflags
DLSUFFIX = .$dlext
PLDLFLAGS = $pldlflags
PLIBSUF = $plibsuf
@@ -112,7 +111,8 @@ dynamic_ext = $dynamic_list
static_ext = $static_list
ext = \$(dynamic_ext) \$(static_ext)
static_ext_autoinit = $static_ai_list
-DYNALOADER = ext/DynaLoader/DynaLoader.a
+DYNALOADER = lib/auto/DynaLoader/DynaLoader.a
+
libs = $libs $cryptlib
@@ -265,8 +265,10 @@ preplibrary: miniperl lib/Config.pm
@./miniperl -Ilib -e 'use AutoSplit; \
autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm
+# Take care to avoid modifying lib/Config.pm without reason
lib/Config.pm: config.sh miniperl
- ./miniperl configpm
+ ./miniperl configpm tmp
+ sh mv-if-diff tmp lib/Config.pm
install: all
./perl installperl
@@ -330,7 +332,7 @@ clean:
rm -f perl.exp ext.libs ext/util/extlibist
-cd x2p; $(MAKE) clean
-cd pod; $(MAKE) clean
- @for x in $(dynamic_ext) $(static_ext) ; do \
+ -@for x in $(DYNALOADER) $(dynamic_ext) $(static_ext) ; do \
sh ext/util/make_ext clean $$x ; \
done
rm -f perl suidperl miniperl $(perllib)
@@ -348,6 +350,7 @@ realclean: clean
rm -rf lib/auto
rm -f h2ph h2ph.man c2ph pstruct
rm -rf .config
+ @echo "Note that make realclean does not delete config.sh"
clobber: realclean
rm -f config.sh cppstdin
@@ -365,6 +368,9 @@ lint: perly.c $(c)
makefile: Makefile
make depend
+config.h: config.sh
+ /bin/sh config_h.SH
+
# When done, touch perlmain.c so that it doesn't get remade each time.
depend: makedepend
- test -f perly.h || cp /dev/null perly.h