From 2be29ee9630cc7fb9b55d35f669c19af21dd3864 Mon Sep 17 00:00:00 2001 From: ceriel Date: Fri, 26 Jun 1992 12:54:57 +0000 Subject: [PATCH] Removed # in commands --- lang/fortran/comp/.distr | 1 + lang/fortran/comp/proto.make | 14 ++++++-------- util/ack/proto.make | 3 +-- util/cpp/proto.make | 3 +-- util/ego/bo/proto.make | 3 +-- util/ego/ca/proto.make | 3 +-- util/ego/cf/proto.make | 3 +-- util/ego/cj/proto.make | 3 +-- util/ego/cs/proto.make | 3 +-- util/ego/ic/proto.make | 3 +-- util/ego/il/proto.make | 3 +-- util/ego/lv/proto.make | 3 +-- util/ego/ra/proto.make | 3 +-- util/ego/sp/proto.make | 3 +-- util/ego/sr/proto.make | 3 +-- util/ego/ud/proto.make | 3 +-- util/grind/proto.make | 5 ++--- util/int/proto.make | 3 +-- util/led/proto.make | 3 +-- util/opt/proto.make | 3 +-- 20 files changed, 26 insertions(+), 45 deletions(-) diff --git a/lang/fortran/comp/.distr b/lang/fortran/comp/.distr index da90eeac..0c4266d7 100644 --- a/lang/fortran/comp/.distr +++ b/lang/fortran/comp/.distr @@ -58,3 +58,4 @@ vax.c version.c xsum.c xsum0.out +mk_tokdefs diff --git a/lang/fortran/comp/proto.make b/lang/fortran/comp/proto.make index eb93cee1..25367e97 100644 --- a/lang/fortran/comp/proto.make +++ b/lang/fortran/comp/proto.make @@ -99,8 +99,7 @@ pr: make pr | opr depend: $(CFILES) tokdefs.h - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ @@ -113,16 +112,15 @@ f2c: $(OBJECTS) $(CC) $(LDFLAGS) $(OBJECTS) $(TARGET_HOME)/modules/lib/libstring.$(LIBSUF) -o f2c gram.c: $(GSRC) $(SRC_DIR)/defs.h tokdefs.h - ( sed gram.in yacc gram.in echo "(expect 4 shift/reduce)" - sed 's/^# line.*/\/* & *\//' y.tab.c >gram.c - rm -f gram.in y.tab.c + mv y.tab.c gram.c + rm -f gram.in -tokdefs.h: $(SRC_DIR)/tokens - grep -n . <$(SRC_DIR)/tokens | \ - sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h +tokdefs.h: $(SRC_DIR)/tokens $(SRC_DIR)/mk_tokdefs + $(SRC_DIR)/mk_tokdefs < $(SRC_DIR)/tokens > tokdefs.h clean: rm -f gram.c *.$(SUF) f2c tokdefs.h Out diff --git a/util/ack/proto.make b/util/ack/proto.make index 3669274e..9fa9bc8c 100644 --- a/util/ack/proto.make +++ b/util/ack/proto.make @@ -86,8 +86,7 @@ ack: $(OBJ) $(CC) $(LDFLAGS) -o ack $(OBJ) $(MODDIR)/libstring.$(LIBSUF) depend: $(ISRC) - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile > Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/cpp/proto.make b/util/cpp/proto.make index 8da64763..d58f60f4 100644 --- a/util/cpp/proto.make +++ b/util/cpp/proto.make @@ -129,8 +129,7 @@ tags: cfiles ctags $(SRC) depend: cfiles - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(SRC) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/bo/proto.make b/util/ego/bo/proto.make index 3c430dc2..881f88b4 100644 --- a/util/ego/bo/proto.make +++ b/util/ego/bo/proto.make @@ -46,8 +46,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/ca/proto.make b/util/ego/ca/proto.make index a7345c31..a8dc23af 100644 --- a/util/ego/ca/proto.make +++ b/util/ego/ca/proto.make @@ -49,8 +49,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/cf/proto.make b/util/ego/cf/proto.make index 8b2d7395..a19b34a5 100644 --- a/util/ego/cf/proto.make +++ b/util/ego/cf/proto.make @@ -53,8 +53,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/cj/proto.make b/util/ego/cj/proto.make index 4d115d71..27eb9a63 100644 --- a/util/ego/cj/proto.make +++ b/util/ego/cj/proto.make @@ -46,8 +46,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/cs/proto.make b/util/ego/cs/proto.make index d2da0d9f..a51263ce 100644 --- a/util/ego/cs/proto.make +++ b/util/ego/cs/proto.make @@ -83,8 +83,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/ic/proto.make b/util/ego/ic/proto.make index e8755f8e..0155b180 100644 --- a/util/ego/ic/proto.make +++ b/util/ego/ic/proto.make @@ -55,8 +55,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/il/proto.make b/util/ego/il/proto.make index 78bc1799..3dce5c39 100644 --- a/util/ego/il/proto.make +++ b/util/ego/il/proto.make @@ -68,8 +68,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/lv/proto.make b/util/ego/lv/proto.make index ac74961c..a42e9279 100644 --- a/util/ego/lv/proto.make +++ b/util/ego/lv/proto.make @@ -47,8 +47,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/ra/proto.make b/util/ego/ra/proto.make index cec24f31..63192beb 100644 --- a/util/ego/ra/proto.make +++ b/util/ego/ra/proto.make @@ -79,8 +79,7 @@ opr: make pr | opr depend: ./itemtab.h - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/sp/proto.make b/util/ego/sp/proto.make index 2906437d..8d6c2d2f 100644 --- a/util/ego/sp/proto.make +++ b/util/ego/sp/proto.make @@ -46,8 +46,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/sr/proto.make b/util/ego/sr/proto.make index 200b9246..da0ef61b 100644 --- a/util/ego/sr/proto.make +++ b/util/ego/sr/proto.make @@ -60,8 +60,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/ego/ud/proto.make b/util/ego/ud/proto.make index f2add3c5..4009bcdb 100644 --- a/util/ego/ud/proto.make +++ b/util/ego/ud/proto.make @@ -56,8 +56,7 @@ opr: make pr | opr depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/grind/proto.make b/util/grind/proto.make index 3d43cff0..ac5d91ba 100644 --- a/util/grind/proto.make +++ b/util/grind/proto.make @@ -104,8 +104,7 @@ dependencies: resolved do_deps `grep '.c$$' Cfiles` make.main: dependencies make_macros lists $(SRC_DIR)/proto.main - sed -e '/^#DEPENDENCIES/,$$d' -e '/^#PARAMS/r make_macros' -e '/^#LISTS/r lists' $(SRC_DIR)/proto.main > make.main - echo '#DEPENDENCIES' >> make.main + rm_deps $(SRC_DIR)/proto.main | sed -e '/^.PARAMS/r make_macros' -e '/^.LISTS/r lists' > make.main cat *.dep >> make.main make_macros: Makefile @@ -127,7 +126,7 @@ lists: Cfiles echo "C_SRC = \\" > lists echo $(CFILES) >> lists echo "OBJ = \\" >> lists - echo $(CFILES) | sed -e 's#[^ ]*/##g' -e 's/\.c/.$$(SUF)/g' >> lists + echo $(CFILES) | sed -e 's|[^ ]*/||g' -e 's/\.c/.$$(SUF)/g' >> lists clean: -make -f make.main clean diff --git a/util/int/proto.make b/util/int/proto.make index 7886ec4a..2a4570f2 100644 --- a/util/int/proto.make +++ b/util/int/proto.make @@ -171,8 +171,7 @@ bare: clean (cd switch; make bare) depend: ./warn.h trap_msg warn_msg - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/led/proto.make b/util/led/proto.make index bdb8612a..b8a04cc6 100644 --- a/util/led/proto.make +++ b/util/led/proto.make @@ -72,8 +72,7 @@ clean: rm -f Out *.$(SUF) led depend: - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \ diff --git a/util/opt/proto.make b/util/opt/proto.make index c5ab38bf..eec06949 100644 --- a/util/opt/proto.make +++ b/util/opt/proto.make @@ -71,8 +71,7 @@ regnoglob.c: $(SRC_DIR)/reg.c cp $(SRC_DIR)/reg.c regnoglob.c depend: pattern.c pop_push.c regglob.c regnoglob.c - sed '/^#DEPENDENCIES/,$$d' Makefile >Makefile.new - echo '#DEPENDENCIES' >>Makefile.new + rm_deps Makefile >Makefile.new for i in $(CFILES) pattern.c regglob.c regnoglob.c ; do \ echo "`basename $$i .c`.$$(SUF): $$i" >> Makefile.new ; \ echo ' $$(CC) -c $$(CFLAGS)' $$i >> Makefile.new ; \