Commit | Line | Data |
c0c09dfd |
1 | *** Makefile.SH.orig Fri Feb 02 16:38:32 1996 |
2 | --- Makefile.SH Sat Feb 03 14:40:28 1996 |
4633a7c4 |
3 | *************** |
4 | *** 31,43 **** |
5 | *[0-9]) plibsuf=.$so.$patchlevel;; |
6 | *) plibsuf=.$so;; |
7 | esac |
8 | case "$shrpdir" in |
9 | /usr/lib) ;; |
10 | "") ;; |
11 | *) shrpenv="env LD_RUN_PATH=$shrpdir";; |
12 | esac |
13 | pldlflags="$cccdlflags";; |
14 | ! *) plibsuf=.a |
15 | pldlflags="";; |
16 | esac |
17 | |
3e01a666 |
18 | --- 31,44 ---- |
4633a7c4 |
19 | *[0-9]) plibsuf=.$so.$patchlevel;; |
20 | *) plibsuf=.$so;; |
21 | esac |
22 | + if test "x$plibext" != "x" ; then plibsuf=$plibext d_shrplib=custom ; fi |
23 | case "$shrpdir" in |
24 | /usr/lib) ;; |
25 | "") ;; |
26 | *) shrpenv="env LD_RUN_PATH=$shrpdir";; |
27 | esac |
28 | pldlflags="$cccdlflags";; |
29 | ! *) plibsuf=$lib_ext |
30 | pldlflags="";; |
31 | esac |
32 | |
33 | *************** |
34 | *** 53,59 **** |
35 | static_ai_list=' ' |
36 | for f in $static_ext; do |
37 | base=`echo "$f" | sed 's/.*\///'` |
38 | ! static_list="$static_list lib/auto/$f/$base.a" |
39 | if test -f ext/$f/AutoInit.c; then |
40 | static_ai_list="$static_ai_list ext/$f/AutoInit.c" |
41 | fi |
3e01a666 |
42 | --- 54,60 ---- |
4633a7c4 |
43 | static_ai_list=' ' |
44 | for f in $static_ext; do |
45 | base=`echo "$f" | sed 's/.*\///'` |
3e01a666 |
46 | ! static_list="$static_list lib/auto/$f/$base\$(LIB_EXT)" |
4633a7c4 |
47 | if test -f ext/$f/AutoInit.c; then |
48 | static_ai_list="$static_ai_list ext/$f/AutoInit.c" |
49 | fi |
50 | *************** |
3e01a666 |
51 | *** 115,122 **** |
4633a7c4 |
52 | static_ext = $static_list |
53 | ext = \$(dynamic_ext) \$(static_ext) |
54 | static_ext_autoinit = $static_ai_list |
55 | ! DYNALOADER = lib/auto/DynaLoader/DynaLoader.a |
56 | ! |
57 | |
58 | libs = $libs $cryptlib |
59 | |
3e01a666 |
60 | --- 116,122 ---- |
4633a7c4 |
61 | static_ext = $static_list |
62 | ext = \$(dynamic_ext) \$(static_ext) |
63 | static_ext_autoinit = $static_ai_list |
3e01a666 |
64 | ! DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) |
4633a7c4 |
65 | |
66 | libs = $libs $cryptlib |
4633a7c4 |
67 | |
3e01a666 |
68 | *************** |
69 | *** 140,145 **** |
70 | --- 140,147 ---- |
71 | # Any special object files needed by this architecture, e.g. os2/os2.obj |
72 | ARCHOBJS = $archobjs |
4633a7c4 |
73 | |
3e01a666 |
74 | + .SUFFIXES: .c \$(OBJ_EXT) |
4633a7c4 |
75 | + |
4633a7c4 |
76 | !GROK!THIS! |
3e01a666 |
77 | |
78 | ## In the following dollars and backticks do not need the extra backslash. |
4633a7c4 |
79 | *************** |
c0c09dfd |
80 | *** 178,188 **** |
4633a7c4 |
81 | |
82 | c = $(c1) $(c2) $(c3) miniperlmain.c perlmain.c |
83 | |
84 | ! obj1 = $(mallocobj) gv.o toke.o perly.o op.o regcomp.o dump.o util.o mg.o |
85 | ! obj2 = hv.o av.o run.o pp_hot.o sv.o pp.o scope.o pp_ctl.o pp_sys.o |
86 | ! obj3 = doop.o doio.o regexec.o taint.o deb.o globals.o |
3e01a666 |
87 | ! |
88 | ! |
89 | obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) |
4633a7c4 |
90 | |
91 | # Once perl has been Configure'd and built ok you build different |
c0c09dfd |
92 | --- 180,189 ---- |
4633a7c4 |
93 | |
94 | c = $(c1) $(c2) $(c3) miniperlmain.c perlmain.c |
95 | |
3e01a666 |
96 | ! obj1 = $(mallocobj) gv$(OBJ_EXT) toke$(OBJ_EXT) perly$(OBJ_EXT) op$(OBJ_EXT) regcomp$(OBJ_EXT) dump$(OBJ_EXT) util$(OBJ_EXT) mg$(OBJ_EXT) |
97 | ! obj2 = hv$(OBJ_EXT) av$(OBJ_EXT) run$(OBJ_EXT) pp_hot$(OBJ_EXT) sv$(OBJ_EXT) pp$(OBJ_EXT) scope$(OBJ_EXT) pp_ctl$(OBJ_EXT) pp_sys$(OBJ_EXT) |
98 | ! obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) taint$(OBJ_EXT) deb$(OBJ_EXT) globals$(OBJ_EXT) |
99 | ! |
100 | obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) |
4633a7c4 |
101 | |
102 | # Once perl has been Configure'd and built ok you build different |
4633a7c4 |
103 | *************** |
c0c09dfd |
104 | *** 201,207 **** |
4633a7c4 |
105 | # grrr |
106 | SHELL = /bin/sh |
107 | |
108 | ! .c.o: |
109 | $(CCCMD) $(PLDLFLAGS) $*.c |
110 | |
3e01a666 |
111 | all: makefile miniperl $(private) $(plextract) $(public) $(dynamic_ext) |
c0c09dfd |
112 | --- 202,208 ---- |
4633a7c4 |
113 | # grrr |
114 | SHELL = /bin/sh |
115 | |
3e01a666 |
116 | ! .c$(OBJ_EXT): |
4633a7c4 |
117 | $(CCCMD) $(PLDLFLAGS) $*.c |
118 | |
3e01a666 |
119 | all: makefile miniperl $(private) $(plextract) $(public) $(dynamic_ext) |
4633a7c4 |
120 | *************** |
c0c09dfd |
121 | *** 230,247 **** |
122 | # build problems but that's not obvious to the novice. |
123 | # The Module used here must not depend on Config or any extensions. |
4633a7c4 |
124 | |
125 | ! miniperl: $& miniperlmain.o $(perllib) |
126 | ! $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain.o $(perllib) $(libs) |
a5f75d66 |
127 | @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest |
4633a7c4 |
128 | |
129 | ! miniperlmain.o: miniperlmain.c |
130 | $(CCCMD) $(PLDLFLAGS) $*.c |
131 | |
3e01a666 |
132 | perlmain.c: miniperlmain.c config.sh makefile $(static_ext_autoinit) |
4633a7c4 |
133 | sh writemain $(DYNALOADER) $(static_ext) > tmp |
134 | sh mv-if-diff tmp perlmain.c |
135 | |
136 | ! perlmain.o: perlmain.c |
137 | $(CCCMD) $(PLDLFLAGS) $*.c |
138 | |
139 | # The file ext.libs is a list of libraries that must be linked in |
c0c09dfd |
140 | --- 231,248 ---- |
141 | # build problems but that's not obvious to the novice. |
142 | # The Module used here must not depend on Config or any extensions. |
4633a7c4 |
143 | |
3e01a666 |
144 | ! miniperl: $& miniperlmain$(OBJ_EXT) $(perllib) |
145 | ! $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) $(perllib) $(libs) |
a5f75d66 |
146 | @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest |
4633a7c4 |
147 | |
3e01a666 |
148 | ! miniperlmain$(OBJ_EXT): miniperlmain.c |
4633a7c4 |
149 | $(CCCMD) $(PLDLFLAGS) $*.c |
150 | |
3e01a666 |
151 | perlmain.c: miniperlmain.c config.sh makefile $(static_ext_autoinit) |
4633a7c4 |
152 | sh writemain $(DYNALOADER) $(static_ext) > tmp |
153 | sh mv-if-diff tmp perlmain.c |
154 | |
3e01a666 |
155 | ! perlmain$(OBJ_EXT): perlmain.c |
4633a7c4 |
156 | $(CCCMD) $(PLDLFLAGS) $*.c |
157 | |
158 | # The file ext.libs is a list of libraries that must be linked in |
159 | *************** |
c0c09dfd |
160 | *** 250,277 **** |
4633a7c4 |
161 | ext.libs: $(static_ext) |
162 | -@test -f ext.libs || touch ext.libs |
163 | |
164 | ! perl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
165 | ! $(SHRPENV) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
166 | |
167 | ! pureperl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
168 | ! purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
169 | |
3e01a666 |
170 | ! quantperl: $& perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
171 | ! quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
4633a7c4 |
172 | |
173 | ! $(perllib): $& perl.o $(obj) |
174 | !NO!SUBS! |
175 | |
176 | case "$d_shrplib" in |
177 | *define*) |
178 | $spitshell >>Makefile <<'!NO!SUBS!' |
179 | ! $(LD) $(LDDLFLAGS) -o $@ perl.o $(obj) |
180 | !NO!SUBS! |
181 | ;; |
182 | *) |
183 | $spitshell >>Makefile <<'!NO!SUBS!' |
184 | rm -f $(perllib) |
3e01a666 |
185 | ! $(AR) rcu $(perllib) perl.o $(obj) |
4633a7c4 |
186 | @$(ranlib) $(perllib) |
187 | !NO!SUBS! |
188 | ;; |
c0c09dfd |
189 | --- 251,290 ---- |
4633a7c4 |
190 | ext.libs: $(static_ext) |
191 | -@test -f ext.libs || touch ext.libs |
192 | |
3e01a666 |
193 | ! perl: $& perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
194 | ! $(SHRPENV) $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o perl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
4633a7c4 |
195 | |
3e01a666 |
196 | ! pureperl: $& perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
197 | ! purify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o pureperl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
4633a7c4 |
198 | |
3e01a666 |
199 | ! quantperl: $& perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
200 | ! quantify $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o quantperl perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
4633a7c4 |
201 | |
3e01a666 |
202 | ! $(perllib): $& perl$(OBJ_EXT) $(obj) |
4633a7c4 |
203 | !NO!SUBS! |
4633a7c4 |
204 | |
205 | case "$d_shrplib" in |
206 | *define*) |
207 | $spitshell >>Makefile <<'!NO!SUBS!' |
3e01a666 |
208 | ! $(LD) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) |
4633a7c4 |
209 | !NO!SUBS! |
210 | ;; |
211 | + custom) |
3e01a666 |
212 | + if test -r $osname/Makefile.SHs ; then |
213 | + . $osname/Makefile.SHs |
4633a7c4 |
214 | + $spitshell >>Makefile <<!GROK!THIS! |
215 | + |
3e01a666 |
216 | + Makefile: $osname/Makefile.SHs |
4633a7c4 |
217 | + |
218 | + !GROK!THIS! |
219 | + else |
220 | + echo "Could not find $osname/Makefile.SH! Skipping target \$(perllib) in Makefile!" |
221 | + fi |
222 | + ;; |
223 | *) |
224 | $spitshell >>Makefile <<'!NO!SUBS!' |
225 | rm -f $(perllib) |
3e01a666 |
226 | ! $(AR) rcu $(perllib) perl$(OBJ_EXT) $(obj) |
4633a7c4 |
227 | @$(ranlib) $(perllib) |
228 | !NO!SUBS! |
229 | ;; |
230 | *************** |
c0c09dfd |
231 | *** 284,293 **** |
4633a7c4 |
232 | # checks as well as the special code to validate that the script in question |
233 | # has been invoked correctly. |
234 | |
235 | ! suidperl: $& sperl.o perlmain.o $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
236 | ! $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain.o sperl.o $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
237 | |
238 | ! sperl.o: perl.c perly.h patchlevel.h $(h) |
239 | $(RMS) sperl.c |
240 | $(LNS) perl.c sperl.c |
241 | $(CCCMD) -DIAMSUID sperl.c |
c0c09dfd |
242 | --- 297,306 ---- |
4633a7c4 |
243 | # checks as well as the special code to validate that the script in question |
244 | # has been invoked correctly. |
245 | |
3e01a666 |
246 | ! suidperl: $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) ext.libs |
247 | ! $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o suidperl perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(perllib) $(DYNALOADER) $(static_ext) `cat ext.libs` $(libs) |
4633a7c4 |
248 | |
3e01a666 |
249 | ! sperl$(OBJ_EXT): perl.c perly.h patchlevel.h $(h) |
4633a7c4 |
250 | $(RMS) sperl.c |
251 | $(LNS) perl.c sperl.c |
252 | $(CCCMD) -DIAMSUID sperl.c |
253 | *************** |
c0c09dfd |
254 | *** 297,303 **** |
4633a7c4 |
255 | # test -d lib/auto || mkdir lib/auto |
256 | # |
3e01a666 |
257 | preplibrary: miniperl lib/Config.pm $(plextract) |
4633a7c4 |
258 | ! @./makedir lib/auto |
259 | @echo " AutoSplitting perl library" |
260 | @./miniperl -Ilib -e 'use AutoSplit; \ |
261 | autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm |
c0c09dfd |
262 | --- 310,316 ---- |
4633a7c4 |
263 | # test -d lib/auto || mkdir lib/auto |
264 | # |
3e01a666 |
265 | preplibrary: miniperl lib/Config.pm $(plextract) |
4633a7c4 |
266 | ! @sh ./makedir lib/auto |
267 | @echo " AutoSplitting perl library" |
268 | @./miniperl -Ilib -e 'use AutoSplit; \ |
269 | autosplit_lib_modules(@ARGV)' lib/*.pm lib/*/*.pm |
270 | *************** |
c0c09dfd |
271 | *** 315,328 **** |
3e01a666 |
272 | |
273 | install: all install.perl install.man |
274 | |
275 | ! install.perl: all |
276 | ./perl installperl |
277 | |
278 | ! install.man: all |
279 | ./perl installman |
280 | |
281 | # Not implemented yet. |
282 | ! #install.html: all |
283 | # ./perl installhtml |
284 | |
285 | # I now supply perly.c with the kits, so the following section is |
c0c09dfd |
286 | --- 328,341 ---- |
3e01a666 |
287 | |
288 | install: all install.perl install.man |
289 | |
290 | ! install.perl: all installperl |
291 | ./perl installperl |
292 | |
293 | ! install.man: all installman |
294 | ./perl installman |
295 | |
296 | # Not implemented yet. |
297 | ! #install.html: all installhtml |
298 | # ./perl installhtml |
299 | |
300 | # I now supply perly.c with the kits, so the following section is |
301 | *************** |
c0c09dfd |
302 | *** 382,389 **** |
4633a7c4 |
303 | @sh ext/util/make_ext static $@ LIBPERL_A=$(perllib) |
304 | |
305 | clean: |
306 | ! rm -f *.o *.a all perlmain.c |
307 | rm -f perl.exp ext.libs |
4633a7c4 |
308 | -cd pod; $(MAKE) clean |
c0c09dfd |
309 | -cd utils; $(MAKE) clean |
310 | -cd x2p; $(MAKE) clean |
311 | --- 395,403 ---- |
4633a7c4 |
312 | @sh ext/util/make_ext static $@ LIBPERL_A=$(perllib) |
313 | |
314 | clean: |
3e01a666 |
315 | ! rm -f *$(OBJ_EXT) *$(LIB_EXT) all perlmain.c |
4633a7c4 |
316 | rm -f perl.exp ext.libs |
317 | + -rm perl.export perl.dll perl.libexp perl.map perl.def |
4633a7c4 |
318 | -cd pod; $(MAKE) clean |
c0c09dfd |
319 | -cd utils; $(MAKE) clean |
320 | -cd x2p; $(MAKE) clean |
4633a7c4 |
321 | *************** |
c0c09dfd |
322 | *** 402,408 **** |
4633a7c4 |
323 | done |
324 | rm -f *.orig */*.orig *~ */*~ core t/core t/c t/perl |
325 | rm -rf $(addedbyconf) |
326 | ! rm -f makefile makefile.old |
327 | rm -f $(private) |
328 | rm -rf lib/auto |
329 | rm -f lib/.exists |
c0c09dfd |
330 | --- 416,422 ---- |
4633a7c4 |
331 | done |
332 | rm -f *.orig */*.orig *~ */*~ core t/core t/c t/perl |
333 | rm -rf $(addedbyconf) |
3e01a666 |
334 | ! rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old |
4633a7c4 |
335 | rm -f $(private) |
336 | rm -rf lib/auto |
337 | rm -f lib/.exists |
338 | *************** |
c0c09dfd |
339 | *** 423,447 **** |
4633a7c4 |
340 | lint: perly.c $(c) |
341 | lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz |
342 | |
343 | ! makefile: Makefile |
3e01a666 |
344 | ! $(MAKE) depend |
4633a7c4 |
345 | |
346 | config.h: config.sh |
3e01a666 |
347 | /bin/sh config_h.SH |
4633a7c4 |
348 | |
349 | # When done, touch perlmain.c so that it doesn't get remade each time. |
350 | depend: makedepend |
351 | ! ./makedepend |
352 | - test -s perlmain.c && touch perlmain.c |
353 | cd x2p; $(MAKE) depend |
354 | |
355 | test: miniperl perl preplibrary $(dynamic_ext) |
356 | - cd t && chmod +x TEST */*.t |
357 | ! - cd t && (rm -f perl; $(LNS) ../perl perl) && ./perl TEST </dev/tty |
358 | |
359 | minitest: miniperl |
360 | - cd t && chmod +x TEST */*.t |
361 | ! - cd t && (rm -f perl; $(LNS) ../miniperl perl) \ |
362 | && ./perl TEST base/*.t comp/*.t cmd/*.t io/*.t op/*.t </dev/tty |
363 | |
364 | clist: $(c) |
c0c09dfd |
365 | --- 437,469 ---- |
3e01a666 |
366 | lint: perly.c $(c) |
367 | lint $(lintflags) $(defs) perly.c $(c) > perl.fuzz |
368 | |
369 | ! # Need to unset during recursion to go out of loop |
370 | ! |
371 | ! MAKEDEPEND = makedepend |
372 | ! |
373 | ! $(FIRSTMAKEFILE): Makefile $(MAKEDEPEND) |
374 | ! $(MAKE) depend MAKEDEPEND= |
375 | |
376 | config.h: config.sh |
377 | /bin/sh config_h.SH |
4633a7c4 |
378 | |
379 | # When done, touch perlmain.c so that it doesn't get remade each time. |
380 | depend: makedepend |
381 | ! sh ./makedepend |
382 | - test -s perlmain.c && touch perlmain.c |
383 | cd x2p; $(MAKE) depend |
384 | |
3e01a666 |
385 | + # Cannot postpone this until $firstmakefile is ready ;-) |
386 | + makedepend: makedepend.SH config.sh |
387 | + sh ./makedepend.SH |
388 | + |
4633a7c4 |
389 | test: miniperl perl preplibrary $(dynamic_ext) |
390 | - cd t && chmod +x TEST */*.t |
3e01a666 |
391 | ! - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) && ./perl TEST </dev/tty |
4633a7c4 |
392 | |
393 | minitest: miniperl |
394 | - cd t && chmod +x TEST */*.t |
3e01a666 |
395 | ! - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../miniperl$(EXE_EXT) perl$(EXE_EXT)) \ |
4633a7c4 |
396 | && ./perl TEST base/*.t comp/*.t cmd/*.t io/*.t op/*.t </dev/tty |
397 | |
398 | clist: $(c) |
399 | *************** |
c0c09dfd |
400 | *** 464,470 **** |
4633a7c4 |
401 | case `pwd` in |
402 | *SH) |
403 | $rm -f ../Makefile |
404 | ! ln Makefile ../Makefile |
405 | ;; |
406 | esac |
407 | ! rm -f makefile |
c0c09dfd |
408 | --- 486,492 ---- |
4633a7c4 |
409 | case `pwd` in |
410 | *SH) |
411 | $rm -f ../Makefile |
412 | ! $ln Makefile ../Makefile |
413 | ;; |
414 | esac |
3e01a666 |
415 | ! $rm -f $firstmakefile |