| @@ -1,38 +1,38 @@ | | | @@ -1,38 +1,38 @@ |
1 | $NetBSD: patch-aa,v 1.4 2003/08/30 20:49:21 jtb Exp $ | | 1 | $NetBSD: patch-aa,v 1.5 2008/06/23 17:55:33 drochner Exp $ |
2 | | | 2 | |
3 | --- src/Makefile.orig 2003-08-08 19:23:47.000000000 +0100 | | 3 | --- src/Makefile.orig 2007-08-24 11:46:36.000000000 +0200 |
4 | +++ src/Makefile 2003-08-08 19:25:03.000000000 +0100 | | 4 | +++ src/Makefile |
5 | @@ -4,8 +4,8 @@ | | 5 | @@ -4,8 +4,8 @@ |
6 | # date: 2003-06-09 | | 6 | # date: 2007-08-23 |
7 | ############################################################# | | 7 | ############################################################# |
8 | | | 8 | |
9 | -CC = cc | | 9 | -CC = cc |
10 | -CFLAGS = -DUNiX -O | | 10 | -CFLAGS = -DUNiX -O |
11 | +#CC = cc | | 11 | +#CC = cc |
12 | +#CFLAGS = -DUNiX -O | | 12 | +#CFLAGS = -DUNiX -O |
13 | # for some compilers it might be necessary to remove the -O flag | | 13 | # for some compilers it might be necessary to remove the -O flag |
14 | # If you have the GNU gcc compiler on your system, you may wish | | 14 | # If you have the GNU gcc compiler on your system, you may wish |
15 | # to use gcc. Then outcomment the first two lines and activate | | 15 | # to use gcc. Then outcomment the first two lines and activate |
16 | @@ -14,7 +14,7 @@ | | 16 | @@ -14,7 +14,7 @@ CFLAGS = -DUNiX -O |
17 | #CC = gcc | | 17 | #CC = gcc |
18 | #CFLAGS = -DUNiX -DPROTO -O -v | | 18 | #CFLAGS = -DUNiX -DPROTO -O -v |
19 | | | 19 | |
20 | -MEMFLAG1 = -DMEM=6 | | 20 | -MEMFLAG1 = -DMEM=8 |
21 | +#MEMFLAG1 = -DMEM=6 | | 21 | +#MEMFLAG1 = -DMEM=8 |
22 | # MEM may be set to any integer value from 1 to 16. | | 22 | # MEM may be set to any integer value from 1 to 16. |
23 | # This is the size of the ARIBAS heap in Megabytes | | 23 | # This is the size of the ARIBAS heap in Megabytes |
24 | # The value should not exceed one half of the RAM of your machine | | 24 | # The value should not exceed one half of the RAM of your machine |
25 | @@ -37,14 +37,14 @@ | | 25 | @@ -37,14 +37,14 @@ $(OBJECTS): common.h |
26 | terminal.o: logscr.inc | | 26 | terminal.o: logscr.inc |
27 | | | 27 | |
28 | .c.o: | | 28 | .c.o: |
29 | - $(CC) $(CFLAGS) -c $< | | 29 | - $(CC) $(CFLAGS) -c $< |
30 | + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< | | 30 | + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< |
31 | | | 31 | |
32 | alloc.o: alloc.c common.h | | 32 | alloc.o: alloc.c common.h |
33 | - $(CC) $(CFLAGS) $(MEMFLAG) -c alloc.c | | 33 | - $(CC) $(CFLAGS) $(MEMFLAG) -c alloc.c |
34 | + $(CC) $(CPPFLAGS) $(CFLAGS) $(MEMFLAG) -c alloc.c | | 34 | + $(CC) $(CPPFLAGS) $(CFLAGS) $(MEMFLAG) -c alloc.c |
35 | | | 35 | |
36 | $(PROGRAM): $(OBJECTS) | | 36 | $(PROGRAM): $(OBJECTS) |
37 | $(CC) -o $(PROGRAM) $(OBJECTS) | | 37 | $(CC) -o $(PROGRAM) $(OBJECTS) |
38 | - strip $(PROGRAM) | | 38 | - strip $(PROGRAM) |