Commit | Line | Data |
---|---|---|
6a809565 JH |
1 | --- ../Makefile.SH 2002-06-09 17:04:06.000000000 +0000 |
2 | +++ Makefile.SH 2003-04-15 00:30:58.000000000 +0000 | |
3 | @@ -329,9 +329,20 @@ | |
4 | .c.s: | |
5 | $(CCCMDSRC) -S $*.c | |
6 | ||
7 | -all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make | |
8 | - @echo " "; | |
9 | - @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | |
10 | +#all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) extra.pods $(private) $(public) $(dynamic_ext) $(nonxs_ext) extras.make | |
11 | +# @echo " "; | |
12 | +# @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | |
13 | +all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) | |
14 | + mv miniperl miniperl-arm | |
15 | + ln -s /usr/bin/perl miniperl | |
16 | + | |
17 | +more: extra.pods $(private) $(public) | |
18 | + | |
19 | +more2: $(dynamic_ext) | |
20 | + | |
21 | +more3: $(nonxs_ext) | |
22 | + | |
23 | +more4: extras.make | |
24 | ||
25 | .PHONY: all compile translators utilities | |
26 | ||
27 | @@ -341,10 +352,10 @@ | |
28 | cd x2p; $(MAKE) compile; | |
29 | cd pod; $(MAKE) compile; | |
30 | ||
31 | -translators: miniperl$(EXE_EXT) lib/Config.pm FORCE | |
32 | +translators: lib/Config.pm FORCE | |
33 | @echo " "; echo " Making x2p stuff"; cd x2p; $(LDLIBPTH) $(MAKE) all | |
34 | ||
35 | -utilities: miniperl$(EXE_EXT) lib/Config.pm $(plextract) lib/lib.pm FORCE | |
36 | +utilities: lib/Config.pm $(plextract) lib/lib.pm FORCE | |
37 | @echo " "; echo " Making utilities"; cd utils; $(LDLIBPTH) $(MAKE) all | |
38 | ||
39 | ||
40 | @@ -521,7 +532,7 @@ | |
41 | $(CC) -o miniperl $(CLDFLAGS) \ | |
42 | `echo $(obj) | sed 's/ op$(OBJ_EXT) / /'` \ | |
43 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) perl$(OBJ_EXT) $(libs) | |
44 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | |
45 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | |
46 | !NO!SUBS! | |
47 | ;; | |
48 | beos*|next4*) | |
49 | @@ -538,7 +549,7 @@ | |
50 | -@rm -f miniperl.xok | |
51 | $(LDLIBPTH) $(CC) $(CLDFLAGS) -o miniperl \ | |
52 | miniperlmain$(OBJ_EXT) opmini$(OBJ_EXT) $(LLIBPERL) $(libs) | |
53 | - $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | |
54 | +# $(LDLIBPTH) ./miniperl -w -Ilib -MExporter -e '<?>' || $(MAKE) minitest | |
55 | !NO!SUBS! | |
56 | ;; | |
57 | esac | |
58 | @@ -664,7 +675,7 @@ | |
59 | # We need to autosplit in two steps because VOS can't handle so many args | |
60 | # | |
61 | .PHONY: preplibrary | |
62 | -preplibrary: miniperl$(EXE_EXT) lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) | |
63 | +preplibrary: lib/Config.pm lib/lib.pm $(PREPLIBRARY_LIBPERL) | |
64 | @sh ./makedir lib/auto | |
65 | @echo " AutoSplitting perl library" | |
66 | $(LDLIBPTH) ./miniperl -Ilib -e 'use AutoSplit; \ | |
67 | @@ -676,11 +687,11 @@ | |
68 | # Take care to avoid modifying lib/Config.pm without reason | |
69 | # (If trying to create a new port and having problems with the configpm script, | |
70 | # try 'make minitest' and/or commenting out the tests at the end of configpm.) | |
71 | -lib/Config.pm: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary | |
72 | +lib/Config.pm: config.sh configpm Porting/Glossary | |
73 | $(LDLIBPTH) ./miniperl -Ilib configpm configpm.tmp | |
74 | sh mv-if-diff configpm.tmp $@ | |
75 | ||
76 | -lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl lib/Config.pm | |
77 | +lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl lib/Config.pm | |
78 | $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp | |
79 | sh mv-if-diff minimod.tmp $@ | |
80 | -touch lib/ExtUtils/Miniperl.pm | |
81 | @@ -688,18 +699,18 @@ | |
82 | lib/re.pm: ext/re/re.pm | |
83 | cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm | |
84 | ||
85 | -$(plextract): miniperl$(EXE_EXT) lib/Config.pm x2p/s2p | |
86 | +$(plextract): lib/Config.pm x2p/s2p | |
87 | @-rm -f $@ | |
88 | $(LDLIBPTH) ./miniperl -Ilib $@.PL | |
89 | ||
90 | -x2p/s2p: miniperl$(EXE_EXT) lib/Config.pm x2p/s2p.PL | |
91 | +x2p/s2p: lib/Config.pm x2p/s2p.PL | |
92 | cd x2p; $(LDLIBPTH) $(MAKE) s2p | |
93 | ||
94 | -lib/lib.pm: miniperl$(EXE_EXT) lib/Config.pm | |
95 | +lib/lib.pm: lib/Config.pm | |
96 | @-rm -f $@ | |
97 | $(LDLIBPTH) ./miniperl -Ilib lib/lib_pm.PL | |
98 | ||
99 | -extra.pods: miniperl$(EXE_EXT) | |
100 | +extra.pods: | |
101 | -@test -f extra.pods && rm -f `cat extra.pods` | |
102 | -@rm -f extra.pods | |
103 | -@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \ | |
104 | @@ -738,18 +749,10 @@ | |
105 | $(MAKE) install.perl install.man STRIPFLAGS=$(STRIPFLAGS) INSTALLFLAGS=-n | |
106 | ||
107 | install.perl: all installperl | |
108 | - if [ -n "$(COMPILE)" ]; \ | |
109 | - then \ | |
110 | - cd utils; $(MAKE) compile; \ | |
111 | - cd ../x2p; $(MAKE) compile; \ | |
112 | - cd ../pod; $(MAKE) compile; \ | |
113 | - else :; \ | |
114 | - fi | |
115 | - $(LDLIBPTH) ./perl installperl $(INSTALLFLAGS) $(STRIPFLAGS) | |
116 | - $(MAKE) extras.install | |
117 | + /usr/bin/perl -Ifake_config_library -MConfig installperl $(INSTALLFLAGS) $(STRIPFLAGS) | |
118 | ||
119 | -install.man: all installman | |
120 | - $(LDLIBPTH) ./perl installman $(INSTALLFLAGS) | |
121 | +install.man: installman | |
122 | + /usr/bin/perl -Ifake_config_library -MConfig installman $(INSTALLFLAGS) | |
123 | ||
124 | # XXX Experimental. Hardwired values, but useful for testing. | |
125 | # Eventually Configure could ask for some of these values. | |
126 | @@ -861,16 +864,16 @@ | |
127 | # | |
128 | # DynaLoader may be needed for extensions that use Makefile.PL. | |
129 | ||
130 | -$(DYNALOADER): miniperl$(EXE_EXT) preplibrary FORCE | |
131 | +$(DYNALOADER): preplibrary FORCE | |
132 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | |
133 | ||
134 | -d_dummy $(dynamic_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | |
135 | +d_dummy $(dynamic_ext): preplibrary $(DYNALOADER) FORCE | |
136 | @$(LDLIBPTH) sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | |
137 | ||
138 | -s_dummy $(static_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | |
139 | +s_dummy $(static_ext): preplibrary $(DYNALOADER) FORCE | |
140 | @$(LDLIBPTH) sh ext/util/make_ext $(STATIC) $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | |
141 | ||
142 | -n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE | |
143 | +n_dummy $(nonxs_ext): preplibrary $(DYNALOADER) FORCE | |
144 | @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) | |
145 | ||
146 | .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ | |
147 | @@ -1009,7 +1012,7 @@ | |
148 | ||
149 | test_prep_pre: preplibrary utilities $(nonxs_ext) | |
150 | ||
151 | -test_prep: test_prep_pre miniperl$(EXE_EXT) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) | |
152 | +test_prep: test_prep_pre perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) | |
153 | PERL=./perl $(MAKE) _test_prep | |
154 | ||
155 | _test_tty: | |
156 | @@ -1078,7 +1081,7 @@ | |
157 | ||
158 | # Can't depend on lib/Config.pm because that might be where miniperl | |
159 | # is crashing. | |
160 | -minitest: miniperl$(EXE_EXT) lib/re.pm | |
161 | +minitest: lib/re.pm | |
162 | -@test -f lib/lib.pm && test -f lib/Config.pm || \ | |
163 | $(MAKE) lib/Config.pm lib/lib.pm | |
164 | @echo " " |