From 5f2d97dfe6c1e8fc767a950bb0b293a8796eb4c5 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Wed, 7 Sep 2005 08:43:25 +0000 Subject: [PATCH] Use exec cc instead of cc (ast) --- commands/Makefile | 1 + commands/advent/Makefile | 2 +- commands/ash/Makefile | 1 + commands/autil/Makefile | 1 + commands/awk/Makefile | 1 + commands/bc/Makefile | 2 +- commands/byacc/Makefile | 2 ++ commands/bzip2-1.0.3/Makefile | 2 +- commands/cawf/Makefile | 2 ++ commands/cron/Makefile | 1 + commands/de/Makefile | 2 +- commands/dhcpd/Makefile | 1 + commands/dis88/Makefile | 1 + commands/elle/Makefile | 1 + commands/elvis/Makefile | 1 + commands/ftp/Makefile | 2 ++ commands/ftpd200/Makefile | 1 + commands/i386/Makefile | 1 + commands/i386/asmconv/Makefile | 1 + commands/i386/mtools-3.9.7/Makefile | 2 +- commands/i86/Makefile | 1 + commands/ibm/Makefile | 1 + commands/ibm/part.c | 2 +- commands/indent/Makefile | 1 + commands/m4/Makefile | 1 + commands/make/Makefile | 1 + commands/mined/Makefile | 2 ++ commands/patch/Makefile | 2 ++ commands/reboot/Makefile | 1 + commands/rlogind/Makefile | 1 + commands/sh/Makefile | 1 + commands/simple/Makefile | 1 + commands/simple/df.c | 2 +- commands/talk/Makefile | 1 + commands/talkd/Makefile | 1 + commands/telnet/Makefile | 1 + commands/telnetd/Makefile | 1 + commands/urlget/Makefile | 1 + commands/yap/Makefile | 1 + commands/zmodem/Makefile | 5 +++-- 40 files changed, 47 insertions(+), 9 deletions(-) diff --git a/commands/Makefile b/commands/Makefile index ff7def883..32e848106 100755 --- a/commands/Makefile +++ b/commands/Makefile @@ -6,6 +6,7 @@ GZIP=gzip-1.2.4 PYTHON=python-1.5.2 BZIP2=bzip2-1.0.3 KERMIT=kermit-2.1.1 +CC=exec cc usage: @echo "Usage: make all # Compile all commands" >&2 diff --git a/commands/advent/Makefile b/commands/advent/Makefile index 249622e78..aff80c4f1 100755 --- a/commands/advent/Makefile +++ b/commands/advent/Makefile @@ -8,7 +8,7 @@ BINDIR = /usr/bin # Flags you may want to add to CFLAGS: # -DHAS_STDC=0 or 1 We have Standard C. Default=1 iff __STDC__ is nonzero. -CC = cc +CC = exec cc CFLAGS = -D_POSIX_SOURCE LDFLAGS = -i diff --git a/commands/ash/Makefile b/commands/ash/Makefile index 7aa567553..be36c228f 100755 --- a/commands/ash/Makefile +++ b/commands/ash/Makefile @@ -19,6 +19,7 @@ OBJS= builtins.o cd.o dirent.o error.o eval.o exec.o expand.o input.o \ CPPFLAGS= -DSHELL -I. -D_MINIX -D_POSIX_SOURCE CFLAGS= -wo -i $(CPPFLAGS) LIBS= -ledit +CC = exec cc CLEANFILES= $(OBJS) \ builtins.c builtins.h init.c mkinit mknodes mksignames mksyntax \ diff --git a/commands/autil/Makefile b/commands/autil/Makefile index 960b6401b..f1a6450b5 100755 --- a/commands/autil/Makefile +++ b/commands/autil/Makefile @@ -1,5 +1,6 @@ # Makefile for commands/autil +CC = exec cc CFLAGS = -I. -D_MINIX -D_POSIX_SOURCE -wo CCLD = $(CC) -i $(CFLAGS) diff --git a/commands/awk/Makefile b/commands/awk/Makefile index 051c5adf1..681659185 100755 --- a/commands/awk/Makefile +++ b/commands/awk/Makefile @@ -1,5 +1,6 @@ # Makefile for awk. +CC = exec cc CFLAGS = -D_MINIX -D_POSIX_SOURCE -wo -w LDFLAGS = -i -f diff --git a/commands/bc/Makefile b/commands/bc/Makefile index bf47a38a4..dcf665aab 100755 --- a/commands/bc/Makefile +++ b/commands/bc/Makefile @@ -18,7 +18,7 @@ YACC = yacc #YACC = bison -y LEX = flex -I8 #LEX = lex -CC = cc +CC = exec cc CFLAGS = -D_POSIX_SOURCE LDFLAGS = -i # diff --git a/commands/byacc/Makefile b/commands/byacc/Makefile index e7680c4be..fc1294069 100755 --- a/commands/byacc/Makefile +++ b/commands/byacc/Makefile @@ -10,6 +10,8 @@ LDFLAGS = -i LIBS = +CC = exec cc + LINKER = $(CC) MAKEFILE = Makefile diff --git a/commands/bzip2-1.0.3/Makefile b/commands/bzip2-1.0.3/Makefile index 479d1563c..d7b1f4821 100644 --- a/commands/bzip2-1.0.3/Makefile +++ b/commands/bzip2-1.0.3/Makefile @@ -2,7 +2,7 @@ SHELL=/bin/sh # To assist in cross-compiling -CC=cc +CC=exec cc AR=ar ARFLAGS=cr RANLIB=ranlib diff --git a/commands/cawf/Makefile b/commands/cawf/Makefile index 98a39d529..cf7bd9343 100755 --- a/commands/cawf/Makefile +++ b/commands/cawf/Makefile @@ -34,6 +34,8 @@ # #DEFS = -DUNIX -DMALLOCH +CC = exec cc + DEFS = -DUNIX -DUSG -DSTDLIB CFLAGS = -i -f -wo -O ${DEFS} diff --git a/commands/cron/Makefile b/commands/cron/Makefile index 50d2d81a8..61cc3b52c 100755 --- a/commands/cron/Makefile +++ b/commands/cron/Makefile @@ -1,6 +1,7 @@ # Makefile for cron. CFLAGS= -D_MINIX -D_POSIX_SOURCE +CC = exec cc LDFLAGS= all: cron crontab diff --git a/commands/de/Makefile b/commands/de/Makefile index 448d22a51..386d5e177 100755 --- a/commands/de/Makefile +++ b/commands/de/Makefile @@ -1,6 +1,6 @@ # Makefile for de -CC = cc +CC = exec cc CFLAGS = -O -D_MINIX -D_POSIX_SOURCE -D_POSIX_1_SOURCE=2 all: de diff --git a/commands/dhcpd/Makefile b/commands/dhcpd/Makefile index 536907a2e..70921fdc5 100755 --- a/commands/dhcpd/Makefile +++ b/commands/dhcpd/Makefile @@ -2,6 +2,7 @@ CFLAGS = $(OPT) -D_MINIX LDFLAGS = +CC = exec cc all: dhcpd diff --git a/commands/dis88/Makefile b/commands/dis88/Makefile index 05d248871..9f863341a 100755 --- a/commands/dis88/Makefile +++ b/commands/dis88/Makefile @@ -26,6 +26,7 @@ CFLAGS =-O -wo OBJ = disrel.o dismain.o distabs.o dishand.o disfp.o +CC=exec cc all: dis88 diff --git a/commands/elle/Makefile b/commands/elle/Makefile index fc87cd71b..d8221eac9 100755 --- a/commands/elle/Makefile +++ b/commands/elle/Makefile @@ -1,5 +1,6 @@ # Makefile for elle +CC = exec cc CFLAGS = -O -DIGN_JOB_CONTROL -D_POSIX_SOURCE -wa LDFLAGS= -i diff --git a/commands/elvis/Makefile b/commands/elvis/Makefile index f5aae998b..d59f9ec1c 100755 --- a/commands/elvis/Makefile +++ b/commands/elvis/Makefile @@ -9,6 +9,7 @@ # PROGS the list of all programs # SORT if the "tags" file must be sorted, then SORT=-DSORT +CC = exec cc PROGS= elvis ctags ref elvrec fmt elvprsv #---- These settings are recommended for Minix-PC ---- diff --git a/commands/ftp/Makefile b/commands/ftp/Makefile index 13feabd1d..6069e8983 100755 --- a/commands/ftp/Makefile +++ b/commands/ftp/Makefile @@ -12,6 +12,8 @@ OBJS= ftp.o local.o file.o other.o net.o all: $(PROG) +CC = exec cc + $(PROG): $(OBJS) $(CC) $(LDFLAGS) -o $@ $(OBJS) install -S 8kw $@ diff --git a/commands/ftpd200/Makefile b/commands/ftpd200/Makefile index 02876581d..8de5f3210 100644 --- a/commands/ftpd200/Makefile +++ b/commands/ftpd200/Makefile @@ -9,6 +9,7 @@ BINDIR= /usr/bin PROG= in.ftpd MANDIR= /usr/man/man8 MANPAGE=ftpd.8 +CC = exec cc OBJS= ftpd.o access.o file.o net.o diff --git a/commands/i386/Makefile b/commands/i386/Makefile index 04867eb2d..75fc447bd 100755 --- a/commands/i386/Makefile +++ b/commands/i386/Makefile @@ -3,6 +3,7 @@ CFLAGS = -D_MINIX -D_POSIX_SOURCE CCLD = $(CC) -i $(CFLAGS) MAKE = exec make -$(MAKEFLAGS) +CC = exec cc all:: acd diff --git a/commands/i386/asmconv/Makefile b/commands/i386/asmconv/Makefile index 9cf02da4b..29f81b3fa 100755 --- a/commands/i386/asmconv/Makefile +++ b/commands/i386/asmconv/Makefile @@ -2,6 +2,7 @@ CFLAGS= $(OPT) LDFLAGS= -i +CC = exec cc all: asmconv diff --git a/commands/i386/mtools-3.9.7/Makefile b/commands/i386/mtools-3.9.7/Makefile index e39632777..fea5d11b5 100755 --- a/commands/i386/mtools-3.9.7/Makefile +++ b/commands/i386/mtools-3.9.7/Makefile @@ -33,7 +33,7 @@ mandir = ${prefix}/man infodir = ${prefix}/info sysconfdir = /etc -CC = cc -D_MINIX +CC = exec cc -D_MINIX CXX = @CXX@ MYCFLAGS = MYCXXFLAGS = diff --git a/commands/i86/Makefile b/commands/i86/Makefile index 8f89b319b..4e69cbeb2 100755 --- a/commands/i86/Makefile +++ b/commands/i86/Makefile @@ -3,6 +3,7 @@ CFLAGS = -D_MINIX -D_POSIX_SOURCE CCLD = $(CC) -i $(CFLAGS) MAKE = exec make -$(MAKEFLAGS) +CC = exec cc all: cc diff --git a/commands/ibm/Makefile b/commands/ibm/Makefile index 2d5206ea5..f251b80a8 100755 --- a/commands/ibm/Makefile +++ b/commands/ibm/Makefile @@ -5,6 +5,7 @@ CFLAGS = -D_MINIX -D_POSIX_SOURCE CCLD = $(CC) -i $(CFLAGS) MAKE = exec make -$(MAKEFLAGS) +CC = exec cc ALL = \ atnormalize \ diff --git a/commands/ibm/part.c b/commands/ibm/part.c index c27025eb0..c647ea802 100755 --- a/commands/ibm/part.c +++ b/commands/ibm/part.c @@ -170,7 +170,7 @@ void stat_reset(void) if (statusrow > STATUSROW) stat_start(0); stat_start(0); putstr( -"Type '+' or '-' to change, 'r' to read, '?' for more help, '!' for advice"); +"Type '+' or '-' to change, 'r' to read, '?' for more help, 'q' to exit"); } statusrow= STATUSROW; need_help= 0; diff --git a/commands/indent/Makefile b/commands/indent/Makefile index e228f65f7..35581d74d 100644 --- a/commands/indent/Makefile +++ b/commands/indent/Makefile @@ -1,6 +1,7 @@ # Makefile for indent CFLAGS= -c -O -D_MINIX -D_POSIX_SOURCE -wo -m +CC = exec cc all: indent diff --git a/commands/m4/Makefile b/commands/m4/Makefile index 81505a528..727efbdae 100755 --- a/commands/m4/Makefile +++ b/commands/m4/Makefile @@ -7,6 +7,7 @@ # CFLAGS = -DEXTENDED -O -D_POSIX_SOURCE -D_MINIX +CC = exec cc OBJ = main.o eval.o serv.o look.o misc.o expr.o INCL = mdef.h extr.h patchlevel.h diff --git a/commands/make/Makefile b/commands/make/Makefile index 2ed91594b..2e36c82bf 100755 --- a/commands/make/Makefile +++ b/commands/make/Makefile @@ -1,6 +1,7 @@ # Makefile for make (!) CFLAGS = -O -Dunix -D_MINIX -D_POSIX_SOURCE +CC = exec cc OBJ = check.o input.o macro.o main.o make.o reader.o rules.o archive.o diff --git a/commands/mined/Makefile b/commands/mined/Makefile index 0a3677a93..2a97d81a2 100755 --- a/commands/mined/Makefile +++ b/commands/mined/Makefile @@ -1,5 +1,7 @@ # Makefile for mined +CC = exec cc + CFLAGS = -O -wo -D_MINIX -D_POSIX_SOURCE OBJ = mined1.o mined2.o diff --git a/commands/patch/Makefile b/commands/patch/Makefile index 96bdfc554..b8cda2f5f 100755 --- a/commands/patch/Makefile +++ b/commands/patch/Makefile @@ -2,6 +2,8 @@ CFLAGS= -O -DVOIDSIG -wo -D_MINIX -D_POSIX_SOURCE -DSMALL +CC = exec cc + OBJ = patch.o pch.o inp.o util.o version.o all: patch diff --git a/commands/reboot/Makefile b/commands/reboot/Makefile index 7b67fa2d0..74f2e2061 100755 --- a/commands/reboot/Makefile +++ b/commands/reboot/Makefile @@ -2,6 +2,7 @@ CFLAGS=$(OPT) -D_MINIX -D_POSIX_SOURCE LDFLAGS=-i +CC=exec cc PROGRAMS= shutdown halt tinyhalt MANUALS= shutdown.8 halt.8 reboot.2 reboot.8 diff --git a/commands/rlogind/Makefile b/commands/rlogind/Makefile index 7792cfd76..ba83d88ab 100755 --- a/commands/rlogind/Makefile +++ b/commands/rlogind/Makefile @@ -1,6 +1,7 @@ # Makefile for rlogind. CFLAGS = $(OPT) -D_MINIX +CC = exec cc LDFLAGS = all: rlogind diff --git a/commands/sh/Makefile b/commands/sh/Makefile index d9527e29d..88bddfd02 100755 --- a/commands/sh/Makefile +++ b/commands/sh/Makefile @@ -2,6 +2,7 @@ CFLAGS = -O -D_MINIX -D_POSIX_SOURCE -wa LDFLAGS = -i +CC = exec cc OBJ = sh1.o sh2.o sh3.o sh4.o sh5.o sh6.o diff --git a/commands/simple/Makefile b/commands/simple/Makefile index d0eae64aa..e4884d0e9 100755 --- a/commands/simple/Makefile +++ b/commands/simple/Makefile @@ -3,6 +3,7 @@ CFLAGS = -D_MINIX -D_POSIX_SOURCE SYS = ../.. CCLD = $(CC) -i $(CFLAGS) +CC = exec cc # This Makefile is large, but that is because it lists all actions that must # be taken to compile and install all the simple commands. If there were only diff --git a/commands/simple/df.c b/commands/simple/df.c index 503ec6e50..da83d0553 100755 --- a/commands/simple/df.c +++ b/commands/simple/df.c @@ -122,7 +122,7 @@ Filesystem Inodes IUsed IFree %%IUsed Mounted on\n", unitsize); } else { printf("%s\n", !iflag ? "\ -Filesystem 1K-Blocks Free Used % Files% Mounted on" : "\ +Filesystem Size (kB) Free Used % Files% Mounted on" : "\ Filesystem Files Free Used % BUsed% Mounted on" ); } diff --git a/commands/talk/Makefile b/commands/talk/Makefile index 269794dc8..ff863d0e1 100755 --- a/commands/talk/Makefile +++ b/commands/talk/Makefile @@ -7,6 +7,7 @@ CFLAGS= -O -D_MINIX -D_POSIX_SOURCE LDFLAGS=-i BINDIR= /usr/bin PROG= talk +CC = exec cc OBJS= talk.o screen.o net.o proto.o diff --git a/commands/talkd/Makefile b/commands/talkd/Makefile index 6a8173069..684fd4bb9 100755 --- a/commands/talkd/Makefile +++ b/commands/talkd/Makefile @@ -7,6 +7,7 @@ CFLAGS= -O -D_MINIX -D_POSIX_SOURCE LDFLAGS=-i BINDIR= /usr/bin PROG= talkd +CC = exec cc OBJS= talkd.o net.o process.o finduser.o diff --git a/commands/telnet/Makefile b/commands/telnet/Makefile index cce1ccbb2..6d215550f 100755 --- a/commands/telnet/Makefile +++ b/commands/telnet/Makefile @@ -2,6 +2,7 @@ CFLAGS= -D_MINIX -D_POSIX_SOURCE LDFLAGS=-i +CC = exec cc SRC= ttn.c ttn_conf.c diff --git a/commands/telnetd/Makefile b/commands/telnetd/Makefile index df0e88e4e..6f6895646 100755 --- a/commands/telnetd/Makefile +++ b/commands/telnetd/Makefile @@ -7,6 +7,7 @@ CFLAGS= -O -D_MINIX -D_POSIX_SOURCE LDFLAGS=-i BINDIR= /usr/bin PROG= in.telnetd +CC = exec cc OBJS= main.o telnet.o term.o pty.o wtmp.o diff --git a/commands/urlget/Makefile b/commands/urlget/Makefile index bf7d23636..ec9f87ba9 100755 --- a/commands/urlget/Makefile +++ b/commands/urlget/Makefile @@ -9,6 +9,7 @@ BINDIR= /usr/bin PROG= urlget LINK1= httpget LINK2= ftpget +CC=exec cc OBJS= urlget.o net.o diff --git a/commands/yap/Makefile b/commands/yap/Makefile index 2268b03dd..e61eca3a6 100755 --- a/commands/yap/Makefile +++ b/commands/yap/Makefile @@ -2,6 +2,7 @@ # CFLAGS : options for the C-compiler CFLAGS = -O -D_MINIX -D_POSIX_SOURCE -wa +CC=exec cc # LDFLAGS : flags for the loader # -i for a PDP-11 with separate I/D (not necessary) diff --git a/commands/zmodem/Makefile b/commands/zmodem/Makefile index 221e40e2d..72d640b27 100755 --- a/commands/zmodem/Makefile +++ b/commands/zmodem/Makefile @@ -2,14 +2,15 @@ all: rz sz +CC = exec cc CFLAGS= -DPOSIX -D_MINIX -D_POSIX_SOURCE -O -wo rz: rz.c rbsb.c zm.c zmodem.h - cc $(CFLAGS) -i -o rz rz.c + $(CC) $(CFLAGS) -i -o rz rz.c install -S 5kw $@ sz: sz.c rbsb.c zm.c zmodem.h - cc $(CFLAGS) -i -o sz sz.c + $(CC) $(CFLAGS) -i -o sz sz.c install -S 5kw $@ install: /usr/bin/rz /usr/bin/sz