projects / packages / CocoR.git / blame
| Commit | Line | Data |
|---|---|---|
| 52f1f948 | 1 | diff -ur CocoR-1.50/cplus2/unix.mk n.CocoR-1.50/cplus2/unix.mk |
| 8fdef769 | 2 | --- CocoR-1.50/cplus2/unix.mk 1999-11-21 07:27:41.000000000 +0100 |
| 52f1f948 | 3 | +++ n.CocoR-1.50/cplus2/unix.mk 2005-12-10 15:35:59.000000000 +0100 |
| 4 | @@ -11,17 +11,17 @@ | |
| 8fdef769 JR |
5 | |
| 6 | #CC sets the name of the compiler to use (cc, gcc, etc) | |
| 7 | #You will have to change this to suit your system | |
| 8 | -#CC = g++ | |
| 52f1f948 | 9 | +#CXX = g++ |
| 8fdef769 JR |
10 | |
| 11 | AR = ar | |
| 12 | -CFLAGS = -g | |
| 13 | +CFLAGS = $(OPTFLAGS) | |
| 14 | DOS2UNIX = ../dos2unix.sh | |
| 15 | ||
| 16 | %.o: %.cpp | |
| 52f1f948 | 17 | - $(CC) -c $(CFLAGS) $< -o $@ |
| 18 | + $(CXX) -c $(CFLAGS) $< -o $@ | |
| 19 | ||
| 20 | %.o: %.cxx | |
| 21 | - $(CC) -c $(CFLAGS) $< -o $@ | |
| 22 | + $(CXX) -c $(CFLAGS) $< -o $@ | |
| 23 | ||
| 24 | all: cr_lib.a | |
| 25 | ||
| 26 | @@ -29,7 +29,7 @@ | |
| 27 | sh -c "$(DOS2UNIX) '*.c?? *.h?? *.mk'" | |
| 28 | ||
| 29 | cr_lib.a: | |
| 30 | - $(CC) $(CFLAGS) -c cr_abs.c?? cr_error.c?? \ | |
| 31 | + $(CXX) $(CFLAGS) -c cr_abs.c?? cr_error.c?? \ | |
| 32 | cr_scan.c?? cr_parse.c?? | |
| 33 | $(AR) -rc cr_lib.a cr_abs.o cr_error.o \ | |
| 34 | cr_scan.o cr_parse.o | |
| 35 | diff -ur CocoR-1.50/sources/unix.mk n.CocoR-1.50/sources/unix.mk | |
| 8fdef769 | 36 | --- CocoR-1.50/sources/unix.mk 2000-04-29 20:52:54.000000000 +0200 |
| 52f1f948 | 37 | +++ n.CocoR-1.50/sources/unix.mk 2005-12-10 10:41:26.000000000 +0100 |
| 8fdef769 JR |
38 | @@ -12,11 +12,11 @@ |
| 39 | # add -DDebug if required | |
| 40 | # CFLAGS = -O -DDebug | |
| 41 | ||
| 42 | -CFLAGS = -O | |
| 43 | +CFLAGS = $(OPTFLAGS) | |
| 44 | ||
| 45 | #CC sets the name of the compiler to use (cc, gcc, etc) | |
| 46 | #You will have to change this to suit your system | |
| 47 | -#CC = cc | |
| 48 | +CC = gcc | |
| 49 | ||
| 50 | DOS2UNIX = ../dos2unix.sh | |
| 52f1f948 | 51 | |
| 52 | diff -ur CocoR-1.50/taste/unix.mk n.CocoR-1.50/taste/unix.mk | |
| 8fdef769 | 53 | --- CocoR-1.50/taste/unix.mk 1999-11-21 07:34:03.000000000 +0100 |
| 52f1f948 | 54 | +++ n.CocoR-1.50/taste/unix.mk 2005-12-10 10:41:26.000000000 +0100 |
| 8fdef769 JR |
55 | @@ -9,11 +9,11 @@ |
| 56 | #CFLAGS for debugging (gdb) | |
| 57 | #CFLAGS = -ggdb | |
| 58 | #CFLAGS for production | |
| 59 | -CFLAGS = -O | |
| 60 | +CFLAGS = $(OPTFLAGS) | |
| 61 | ||
| 62 | #CC sets the name of the compiler to use (cc, gcc, etc) | |
| 63 | #You will have to change this to suit your system | |
| 64 | -#CC = cc | |
| 65 | +CC = gcc | |
| 66 | ||
| 67 | COCOR = ../cocor | |
| 68 | DOS2UNIX = ../dos2unix.sh | |
| 52f1f948 | 69 | diff -ur CocoR-1.50/taste_cp/unix.mk n.CocoR-1.50/taste_cp/unix.mk |
| 8fdef769 | 70 | --- CocoR-1.50/taste_cp/unix.mk 1999-11-21 07:34:48.000000000 +0100 |
| 52f1f948 | 71 | +++ n.CocoR-1.50/taste_cp/unix.mk 2005-12-10 15:36:49.000000000 +0100 |
| 72 | @@ -8,18 +8,18 @@ | |
| 8fdef769 JR |
73 | |
| 74 | #CC sets the name of the compiler to use (cc, gcc, etc) | |
| 75 | #You will have to change this to suit your system | |
| 76 | -#CC = g++ | |
| 52f1f948 | 77 | +#CXX = g++ |
| 8fdef769 JR |
78 | |
| 79 | -CFLAGS = -g -I../cplus2 | |
| 80 | +CFLAGS = $(OPTFLAGS) -I../cplus2 | |
| 81 | COCOR = ../cocor | |
| 82 | DOS2UNIX = ../dos2unix.sh | |
| 83 | LIB = ../cplus2/cr_lib.a | |
| 52f1f948 | 84 | |
| 85 | %.o: %.cpp | |
| 86 | - $(CC) -c $(CFLAGS) $< -o $@ | |
| 87 | + $(CXX) -c $(CFLAGS) $< -o $@ | |
| 88 | ||
| 89 | %.o: %.cxx | |
| 90 | - $(CC) -c $(CFLAGS) $< -o $@ | |
| 91 | + $(CXX) -c $(CFLAGS) $< -o $@ | |
| 92 | ||
| 93 | all: taste pretty xref | |
| 94 | ||
| 95 | @@ -35,28 +35,28 @@ | |
| 96 | do (mv $$i.cpp $$i.cxx); done | |
| 97 | ||
| 98 | taste: tastep.o taste.o tc.o tl.o | |
| 99 | - $(CC) $(CFLAGS) -otaste taste.o tl.o tc.o\ | |
| 100 | + $(CXX) $(CFLAGS) -otaste taste.o tl.o tc.o\ | |
| 101 | tastes.o tastep.o $(LIB) | |
| 102 | ||
| 103 | tastep.o: taste.atg | |
| 104 | $(COCOR) taste.atg | |
| 105 | - $(CC) $(CFLAGS) -c taste.c?? tastep.c?? tastes.c?? | |
| 106 | + $(CXX) $(CFLAGS) -c taste.c?? tastep.c?? tastes.c?? | |
| 107 | ||
| 108 | pretty: prettyp.o pretty.o prettypr.o | |
| 109 | - $(CC) $(CFLAGS) -opretty pretty.o prettypr.o \ | |
| 110 | + $(CXX) $(CFLAGS) -opretty pretty.o prettypr.o \ | |
| 111 | prettys.o prettyp.o $(LIB) | |
| 112 | ||
| 113 | prettyp.o: pretty.atg | |
| 114 | $(COCOR) pretty.atg | |
| 115 | - $(CC) $(CFLAGS) -c pretty.c?? prettyp.c?? prettys.c?? | |
| 116 | + $(CXX) $(CFLAGS) -c pretty.c?? prettyp.c?? prettys.c?? | |
| 117 | ||
| 118 | xref: xrefp.o xref.o crossref.o | |
| 119 | - $(CC) $(CFLAGS) -oxref xref.o crossref.o \ | |
| 120 | + $(CXX) $(CFLAGS) -oxref xref.o crossref.o \ | |
| 121 | xrefs.o xrefp.o $(LIB) | |
| 122 | ||
| 123 | xrefp.o: xref.atg | |
| 124 | $(COCOR) xref.atg | |
| 125 | - $(CC) $(CFLAGS) -c xref.c?? xrefp.c?? xrefs.c?? | |
| 126 | + $(CXX) $(CFLAGS) -c xref.c?? xrefp.c?? xrefs.c?? | |
| 127 | ||
| 128 | clean: | |
| 129 | set -i; \ | |
| 130 | diff -ur CocoR-1.50/unix.mk n.CocoR-1.50/unix.mk | |
| 8fdef769 | 131 | --- CocoR-1.50/unix.mk 1998-04-15 17:48:11.000000000 +0200 |
| 52f1f948 | 132 | +++ n.CocoR-1.50/unix.mk 2005-12-10 10:41:24.000000000 +0100 |
| 8fdef769 JR |
133 | @@ -50,7 +50,7 @@ |
| 134 | do (cd $$i; $(MAKE) -f unix.mk)\ | |
| 135 | done | |
| 136 | ||
| 137 | -linux: ;$(MAKE) -f unix.mk CC=cc all1 | |
| 138 | +linux: ;$(MAKE) -f unix.mk all1 | |
| 139 | solaris: ;$(MAKE) -f unix.mk CC=gcc all1 | |
| 140 |