| @@ -1,17 +1,18 @@ | | | @@ -1,17 +1,18 @@ |
1 | $NetBSD: patch-aa,v 1.5 2015/12/29 23:34:55 dholland Exp $ | | 1 | $NetBSD: patch-aa,v 1.6 2016/06/01 13:32:13 joerg Exp $ |
2 | | | 2 | |
3 | Configure for pkgsrc. | | 3 | Configure for pkgsrc. |
4 | Fix installation rules. | | 4 | Fix installation rules. |
| | | 5 | Missing dependency of scmfig.h scmflags.h. |
5 | | | 6 | |
6 | --- Makefile.orig 2006-10-25 01:47:17.000000000 +0000 | | 7 | --- Makefile.orig 2006-10-25 01:47:17.000000000 +0000 |
7 | +++ Makefile | | 8 | +++ Makefile |
8 | @@ -44,7 +44,7 @@ | | 9 | @@ -44,7 +44,7 @@ |
9 | SHELL = /bin/sh | | 10 | SHELL = /bin/sh |
10 | #CC = gcc | | 11 | #CC = gcc |
11 | #CFLAGS = -g | | 12 | #CFLAGS = -g |
12 | -#LIBS = | | 13 | -#LIBS = |
13 | +LIBS = -lm | | 14 | +LIBS = -lm |
14 | #LD = $(CC) -g | | 15 | #LD = $(CC) -g |
15 | LD = $(CC) | | 16 | LD = $(CC) |
16 | SCMLIT = ./scmlit | | 17 | SCMLIT = ./scmlit |
17 | @@ -86,7 +86,7 @@ srcdir.mk: Makefile | | 18 | @@ -86,7 +86,7 @@ srcdir.mk: Makefile |
| @@ -24,26 +25,59 @@ Fix installation rules. | | | @@ -24,26 +25,59 @@ Fix installation rules. |
24 | # directory where COPYING and InitXXX.scm reside. | | 25 | # directory where COPYING and InitXXX.scm reside. |
25 | #IMPLPATH = /usr/local/src/scm/ | | 26 | #IMPLPATH = /usr/local/src/scm/ |
26 | @@ -110,7 +110,9 @@ ofiles = scm.o time.o repl.o scl.o sys.o | | 27 | @@ -110,7 +110,9 @@ ofiles = scm.o time.o repl.o scl.o sys.o |
27 | # continue-ia64.o | | 28 | # continue-ia64.o |
28 | ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \ | | 29 | ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \ |
29 | Tscript.scm compile.scm Iedline.scm Idiffer.scm | | 30 | Tscript.scm compile.scm Iedline.scm Idiffer.scm |
30 | -hobfiles = hobbit.scm scmhob.scm scmhob.h | | 31 | -hobfiles = hobbit.scm scmhob.scm scmhob.h |
31 | +hobsrcs = hobbit.scm scmhob.scm | | 32 | +hobsrcs = hobbit.scm scmhob.scm |
32 | +hobincs = scmhob.h | | 33 | +hobincs = scmhob.h |
33 | +hobfiles = $(hobsrcs) $(hobincs) | | 34 | +hobfiles = $(hobsrcs) $(hobincs) |
34 | turfiles = turtlegr.c turtle grtest.scm | | 35 | turfiles = turtlegr.c turtle grtest.scm |
35 | xafiles = xatoms.scm x11.scm xevent.scm keysymdef.scm | | 36 | xafiles = xatoms.scm x11.scm xevent.scm keysymdef.scm |
36 | xfiles = x.c x.h xgen.scm xevent.h inc2scm $(xafiles) | | 37 | xfiles = x.c x.h xgen.scm xevent.h inc2scm $(xafiles) |
| | | 38 | @@ -138,19 +140,19 @@ scmflags: |
| | | 39 | else mv newflags.h scmflags.h; fi |
| | | 40 | .c.o: |
| | | 41 | $(CC) -c $(CFLAGS) $< -o $@ |
| | | 42 | -scm.o: scm.c scm.h scmfig.h scmflags.h patchlvl.h |
| | | 43 | -scmmain.o: scmmain.c scm.h scmfig.h scmflags.h patchlvl.h |
| | | 44 | -scl.o: scl.c scm.h scmfig.h scmflags.h |
| | | 45 | -eval.o: eval.c scm.h scmfig.h scmflags.h setjump.h |
| | | 46 | -debug.o: debug.c scm.h scmfig.h scmflags.h setjump.h |
| | | 47 | -unif.o: unif.c scm.h scmfig.h scmflags.h |
| | | 48 | -#ramap.o: ramap.c scm.h scmfig.h scmflags.h |
| | | 49 | -repl.o: repl.c scm.h scmfig.h scmflags.h setjump.h |
| | | 50 | -sys.o: sys.c scm.h scmfig.h scmflags.h setjump.h |
| | | 51 | -time.o: time.c scm.h scmfig.h scmflags.h |
| | | 52 | -subr.o: subr.c scm.h scmfig.h scmflags.h |
| | | 53 | -rope.o: rope.c scm.h scmfig.h scmflags.h |
| | | 54 | -continue.o: continue.c continue.h setjump.h scm.h scmfig.h scmflags.h |
| | | 55 | +scm.o: scm.c scm.h scmfig.h scmflags.h scmflags.h patchlvl.h |
| | | 56 | +scmmain.o: scmmain.c scm.h scmfig.h scmflags.h scmflags.h patchlvl.h |
| | | 57 | +scl.o: scl.c scm.h scmfig.h scmflags.h scmflags.h |
| | | 58 | +eval.o: eval.c scm.h scmfig.h scmflags.h scmflags.h setjump.h |
| | | 59 | +debug.o: debug.c scm.h scmfig.h scmflags.h scmflags.h setjump.h |
| | | 60 | +unif.o: unif.c scm.h scmfig.h scmflags.h scmflags.h |
| | | 61 | +#ramap.o: ramap.c scm.h scmfig.h scmflags.h scmflags.h |
| | | 62 | +repl.o: repl.c scm.h scmfig.h scmflags.h scmflags.h setjump.h |
| | | 63 | +sys.o: sys.c scm.h scmfig.h scmflags.h scmflags.h setjump.h |
| | | 64 | +time.o: time.c scm.h scmfig.h scmflags.h scmflags.h |
| | | 65 | +subr.o: subr.c scm.h scmfig.h scmflags.h scmflags.h |
| | | 66 | +rope.o: rope.c scm.h scmfig.h scmflags.h scmflags.h |
| | | 67 | +continue.o: continue.c continue.h setjump.h scm.h scmfig.h scmflags.h scmflags.h |
| | | 68 | continue-ia64.o: continue-ia64.S get-contoffset-ia64.c |
| | | 69 | gcc -o get-contoffset-ia64 get-contoffset-ia64.c |
| | | 70 | ./get-contoffset-ia64 contoffset-ia64.S |
37 | @@ -249,7 +251,7 @@ libscm.opt: | | 71 | @@ -249,7 +251,7 @@ libscm.opt: |
38 | echo "-F engineering-notation" >> libscm.opt | | 72 | echo "-F engineering-notation" >> libscm.opt |
39 | echo "-F dynamic-linking" >> libscm.opt | | 73 | echo "-F dynamic-linking" >> libscm.opt |
40 | mylib: libscm.a | | 74 | mylib: libscm.a |
41 | -libscm.a: libscm.opt | | 75 | -libscm.a: libscm.opt |
42 | +libscm.a: libscm.opt scmlit | | 76 | +libscm.a: libscm.opt scmlit |
43 | $(BUILD) -t lib -f libscm.opt | | 77 | $(BUILD) -t lib -f libscm.opt |
44 | libtest: libscm.a libtest.c | | 78 | libtest: libscm.a libtest.c |
45 | $(LD) -o libtest libtest.c libscm.a -ldl -lm -lc | | 79 | $(LD) -o libtest libtest.c libscm.a -ldl -lm -lc |
46 | @@ -420,12 +422,12 @@ $(PREVDOCS)scm.info: srcdir.mk Makefile | | 80 | @@ -420,12 +422,12 @@ $(PREVDOCS)scm.info: srcdir.mk Makefile |
47 | | | 81 | |
48 | rpm_prefix=$(HOME)/rpmbuild/ | | 82 | rpm_prefix=$(HOME)/rpmbuild/ |
49 | | | 83 | |