Removed # in commands

diff --git a/lang/fortran/comp/.distr b/lang/fortran/comp/.distr
index da90eea..0c4266d 100644 (file)
--- 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 eb93cee..25367e9 100644 (file)
--- 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 <tokdefs.h "s/#define/%token/" ;\
+       ( sed <tokdefs.h "s/^.define/%token/" ;\
                cat $(GSRC) ) >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 3669274..9fa9bc8 100644 (file)
--- 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 8da6476..d58f60f 100644 (file)
--- 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 3c430dc..881f88b 100644 (file)
--- 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 a7345c3..a8dc23a 100644 (file)
--- 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 8b2d739..a19b34a 100644 (file)
--- 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 4d115d7..27eb9a6 100644 (file)
--- 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 d2da0d9..a51263c 100644 (file)
--- 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 e8755f8..0155b18 100644 (file)
--- 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 78bc179..3dce5c3 100644 (file)
--- 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 ac74961..a42e927 100644 (file)
--- 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 cec24f3..63192be 100644 (file)
--- 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 2906437..8d6c2d2 100644 (file)
--- 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 200b924..da0ef61 100644 (file)
--- 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 f2add3c..4009bcd 100644 (file)
--- 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 3d43cff..ac5d91b 100644 (file)
--- 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 7886ec4..2a4570f 100644 (file)
--- 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 bdb8612..b8a04cc 100644 (file)
--- 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 c5ab38b..eec0694 100644 (file)
--- 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 ; \