Makefileを修正し、casl2lib.depの内容も集約

diff --git a/as/Makefile b/as/Makefile
index 9b17270e465d456649d968249784e48aa5ded46a..5e8bdbaffb1725094a3b45860271b26deb1ef207 100644 (file)
--- a/as/Makefile
+++ b/as/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all libfiles install-casl2lib uninstall-casl2lib
+.PHONY: all clean distclean
 
 CAT := cat
 CASL2OUT := casl2 -M4096 -O
@@ -8,30 +8,70 @@ ECHO := echo
 INSTALL := install
 CHMOD := chmod
 
-prefix ?= ~
-casl2libdir ?= $(prefix)/share/casl2lib
 
-all: stdlib.casl libfiles
+all: abs.casl addl32.casl diva.casl divl.casl inl.casl l2str.casl max.casl minim.casl mula.casl mull.casl outa.casl outaq15.casl outb.casl outbw.casl outl.casl outlq15.casl outpbm.casl pbm16.casl str2l.casl
 
-%.casl: src/%.casl
-       $(CHMOD) +w $@
+abs.casl: src/abs.casl
        $(CAT) $^ >$@
-       $(CHMOD) -w $@
 
-%.o: %.casl
-       $(CASL2OUT)$< $@
+addl32.casl: src/addl32.casl
+       $(CAT) $^ >$@
+
+diva.casl: src/diva.casl divl.casl
+       $(CAT) $^ >$@
+
+divl.casl: src/divl.casl
+       $(CAT) $^ >$@
+
+inl.casl: src/inl.casl str2l.casl
+       $(CAT) $^ >$@
+
+l2str.casl: src/l2str.casl divl.casl rev.casl
+       $(CAT) $^ >$@
+
+max.casl: src/max.casl
+       $(CAT) $^ >$@
+
+minim.casl: src/minim.casl
+       $(CAT) $^ >$@
+
+mula.casl: src/mula.casl mull.casl
+       $(CAT) $^ >$@
+
+mull.casl: src/mull.casl
+       $(CAT) $^ >$@
+
+outa.casl: src/outa.casl abs.casl divl.casl rev.casl
+       $(CAT) $^ >$@
 
-include casl2lib.dep
+outaq15.casl: src/outaq15.casl abs.casl mull.casl
+       $(CAT) $^ >$@
+
+outb.casl: src/outb.casl divl.casl rev.casl
+       $(CAT) $^ >$@
+
+outbw.casl: src/outbw.casl divl.casl rev.casl
+       $(CAT) $^ >$@
+
+outl.casl: src/outl.casl divl.casl rev.casl
+       $(CAT) $^ >$@
+
+outlq15.casl: src/outlq15.casl mull.casl
+       $(CAT) $^ >$@
+
+outpbm.casl: src/outpbm.casl l2str.casl
+       $(CAT) $^ >$@
+
+pbm16.casl: src/pbm16.casl outb.casl
+       $(CAT) $^ >$@
+
+rev.casl: src/rev.casl
+       $(CAT) $^ >$@
+
+str2l.casl: src/str2l.casl mull.casl
+       $(CAT) $^ >$@
 
 clean:
 
 distclean:
        $(RM) *.casl
-
-install-casl2lib: *.casl
-       $(INSTALL) -d $(casl2libdir)
-       $(INSTALL) $^ $(casl2libdir)/
-
-uninstall-casl2lib:
-       @$(RMF) $(casl2libdir)/*.casl
-       @$(RMDIR) $(casl2libdir) || if test -e $(casl2libdir); then $(ECHO) "$(casl2libdir): files may be added by others."; fi

diff --git a/as/casl2lib.dep b/as/casl2lib.dep
deleted file mode 100644 (file)
index ae4751b..0000000
--- a/as/casl2lib.dep
+++ /dev/null
@@ -1,43 +0,0 @@
-stdlib.casl: src/stdlib.casl src/abs.casl src/addl32.casl src/diva.casl src/divl.casl src/inl.casl src/l2str.casl src/max.casl src/minim.casl src/mula.casl src/mull.casl src/outa.casl src/outaq15.casl src/outb.casl src/outbw.casl src/outl.casl src/outlq15.casl src/outpbm.casl src/pbm16.casl src/rev.casl src/str2l.casl
-
-libfiles: abs.casl addl32.casl diva.casl divl.casl inl.casl l2str.casl max.casl minim.casl mula.casl mull.casl outa.casl outaq15.casl outb.casl outbw.casl outl.casl outlq15.casl outpbm.casl pbm16.casl str2l.casl
-
-abs.casl: src/abs.casl
-
-addl32.casl: src/addl32.casl
-
-diva.casl: src/diva.casl divl.casl
-
-divl.casl: src/divl.casl
-
-inl.casl: src/inl.casl str2l.casl
-
-l2str.casl: src/l2str.casl divl.casl rev.casl
-
-max.casl: src/max.casl
-
-minim.casl: src/minim.casl
-
-mula.casl: src/mula.casl mull.casl
-
-mull.casl: src/mull.casl
-
-outa.casl: src/outa.casl abs.casl divl.casl rev.casl
-
-outaq15.casl: src/outaq15.casl abs.casl mull.casl
-
-outb.casl: src/outb.casl divl.casl rev.casl
-
-outbw.casl: src/outbw.casl divl.casl rev.casl
-
-outl.casl: src/outl.casl divl.casl rev.casl
-
-outlq15.casl: src/outlq15.casl mull.casl
-
-outpbm.casl: src/outpbm.casl l2str.casl
-
-pbm16.casl: src/pbm16.casl outb.casl
-
-rev.casl: src/rev.casl
-
-str2l.casl: src/str2l.casl mull.casl