Browse Source

Removed # in commands

ceriel 32 years ago
parent
commit
2be29ee963

+ 1 - 0
lang/fortran/comp/.distr

@@ -58,3 +58,4 @@ vax.c
 version.c
 xsum.c
 xsum0.out
+mk_tokdefs

+ 6 - 8
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

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 2 - 3
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

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \

+ 1 - 2
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 ; \