New installation mechanism

diff --git a/mach/pdp/int/.distr b/mach/pdp/int/.distr
index 8d9cd45..0193284 100644 (file)
--- a/mach/pdp/int/.distr
+++ b/mach/pdp/int/.distr
@@ -1,4 +1,4 @@
-Makefile
+proto.make
 README
 em.1
 eminform.1

diff --git a/mach/pdp/int/README b/mach/pdp/int/README
index 2677deb..28e75aa 100644 (file)
--- a/mach/pdp/int/README
+++ b/mach/pdp/int/README
@@ -1,6 +1,5 @@
 In this directory is a complete interpreter for EM-code on a
 PDP 11, written in Unix assembly language.
-The interpreter is split up in 7 files, em.v1 up to em.v7.
 There exist assembler options .test .opfreq .flow .count .prof
 and .last.
 .test tests undefined integers, bad arrays etcetera

diff --git a/mach/pdp/int/proto.make b/mach/pdp/int/proto.make
new file mode 100644 (file)
index 0000000..d92f391
--- /dev/null
+++ b/mach/pdp/int/proto.make
@@ -0,0 +1,63 @@
+# $Header$
+
+#PARAMS                do not remove this line!
+
+INTS=em_t--- em_---- em_tf-- em_t-c- em_t--p
+
+SRC_DIR = $(SRC_HOME)/mach/pdp/int
+CFLAGS = $(COPTIONS) -I$(TARGET_HOME)/h -I$(TARGET_HOME)/config
+LDFLAGS = $(LDOPTIONS)
+
+b=$(TARGET_HOME)/lib.bin/em22
+
+all:   $(INTS) eminform em
+
+em:    em.o
+       $(CC) $(LDFLAGS) -o em em.c
+
+em.o:  $(SRC_DIR)/em.c
+       $(CC) $(CFLAGS) -c $(SRC_DIR)/em.c
+
+eminform:      $(SRC_DIR)/eminform.s
+       as $(SRC_DIR)/eminform.s;ld -i -o eminform a.out -lc
+
+em_t---:       $(SRC_DIR)/t+ $(SRC_DIR)/f- $(SRC_DIR)/c- $(SRC_DIR)/p- $(SRC_DIR)/em_int.s
+       as $(SRC_DIR)/t+ $(SRC_DIR)/f- $(SRC_DIR)/c- $(SRC_DIR)/p- $(SRC_DIR)/em_int.s;ld -i -o em_t--- a.out -lc
+
+em_----:       $(SRC_DIR)/t- $(SRC_DIR)/f- $(SRC_DIR)/c- $(SRC_DIR)/p- $(SRC_DIR)/em_int.s
+       as $(SRC_DIR)/t- $(SRC_DIR)/f- $(SRC_DIR)/c- $(SRC_DIR)/p- $(SRC_DIR)/em_int.s;ld -i -o em_---- a.out -lc
+
+em_tf--:       $(SRC_DIR)/t+ $(SRC_DIR)/f+ $(SRC_DIR)/c- $(SRC_DIR)/p- $(SRC_DIR)/em_int.s
+       as $(SRC_DIR)/t+ $(SRC_DIR)/f+ $(SRC_DIR)/c- $(SRC_DIR)/p- $(SRC_DIR)/em_int.s;ld -i -o em_tf-- a.out -lc
+
+em_t-c-:       $(SRC_DIR)/t+ $(SRC_DIR)/f- $(SRC_DIR)/c+ $(SRC_DIR)/p- $(SRC_DIR)/em_int.s
+       as $(SRC_DIR)/t+ $(SRC_DIR)/f- $(SRC_DIR)/c+ $(SRC_DIR)/p- $(SRC_DIR)/em_int.s;ld -i -o em_t-c- a.out -lc
+
+em_t--p:       $(SRC_DIR)/t+ $(SRC_DIR)/f- $(SRC_DIR)/c- $(SRC_DIR)/p+ $(SRC_DIR)/em_int.s
+       as $(SRC_DIR)/t+ $(SRC_DIR)/f- $(SRC_DIR)/c- $(SRC_DIR)/p+ $(SRC_DIR)/em_int.s;ld -i -o em_t--p a.out -lc
+
+install:       all
+               -mkdir $b
+               cp em_???? $b
+               cp em eminform $(TARGET_HOME)/bin
+               cp $(SRC_DIR)/em.1 $(SRC_DIR)/eminform.1 $(TARGET_HOME)/man
+
+cmp:           all
+               -cmp em_t--- $b/em_t---
+               -cmp em_---- $b/em_----
+               -cmp em_tf-- $b/em_tf--
+               -cmp em_t-c- $b/em_t-c-
+               -cmp em_t--p $b/em_t--p
+               -cmp em $(TARGET_HOME)/bin/em
+               -cmp eminform $(TARGET_HOME)/bin/eminform
+               -cmp $(SRC_DIR)/em.1 $(TARGET_HOME)/man/em.1
+               -cmp $(SRC_DIR)/eminform.1 $(TARGET_HOME)/man/eminform.1
+
+clean:
+               -rm -f *.o *.old a.out em eminform $(INTS)
+
+opr:
+               make pr | opr
+
+pr:
+               @pr $(SRC_DIR)/em.c $(SRC_DIR)/em_int.s $(SRC_DIR)/eminform.s

diff --git a/mach/pmds/libsys/.distr b/mach/pmds/libsys/.distr
index 7b4628e..1edec9f 100644 (file)
--- a/mach/pmds/libsys/.distr
+++ b/mach/pmds/libsys/.distr
@@ -1,5 +1,3 @@
 LIST
-Makefile
 head_em.s
 libmon_s.a
-compmodule

diff --git a/mach/pmds4/.distr b/mach/pmds4/.distr
index 76d303d..83f8deb 100644 (file)
--- a/mach/pmds4/.distr
+++ b/mach/pmds4/.distr
@@ -1,2 +1,3 @@
 Action
 libsys
+mach_params

diff --git a/mach/pmds4/mach_params b/mach/pmds4/mach_params
new file mode 100644 (file)
index 0000000..b771f20
--- /dev/null
+++ b/mach/pmds4/mach_params
@@ -0,0 +1,4 @@
+MACH=pmds4
+SUF=o
+ASAR=aal
+RANLIB=:

diff --git a/mach/sun2/.distr b/mach/sun2/.distr
index 36bc09b..0e1e702 100644 (file)
--- a/mach/sun2/.distr
+++ b/mach/sun2/.distr
@@ -1,6 +1,4 @@
 Action
 cv
 libsys
-libcc
-liboc
-libm2
+mach_params

diff --git a/mach/sun2/Action b/mach/sun2/Action
index 02f0bb2..258977c 100644 (file)
--- a/mach/sun2/Action
+++ b/mach/sun2/Action
@@ -4,13 +4,3 @@ end
 name "Sun 2 M68000 systemcall library"
 dir libsys
 end
-name "Sun 2 M68000 C libraries"
-dir libcc
-end
-name "Sun 2 M68000 Occam library"
-system "vax_bsd4_2|sun*"
-dir liboc
-end
-name "Sun 2 M68000 Modula-2 library"
-dir libm2
-end

diff --git a/mach/sun2/cv/.distr b/mach/sun2/cv/.distr
index d7a861d..cafc230 100644 (file)
--- a/mach/sun2/cv/.distr
+++ b/mach/sun2/cv/.distr
@@ -1,2 +1 @@
-Makefile
-cv.c
+proto.make

diff --git a/mach/sun2/cv/proto.make b/mach/sun2/cv/proto.make
new file mode 100644 (file)
index 0000000..817447d
--- /dev/null
+++ b/mach/sun2/cv/proto.make
@@ -0,0 +1,33 @@
+# $Header$
+
+#PARAMS                do not remove this line!
+
+OBJLIB=$(TARGET_HOME)/modules/lib/libobject.$(LIBSUF)
+
+SRC_DIR = $(SRC_HOME)/mach/sun3/cv
+
+all:   cv
+
+cv:    cv.$(SUF)
+       $(CC) $(LDOPTIONS) -o cv cv.$(SUF) $(OBJLIB)
+
+cv.$(SUF):     $(SRC_DIR)/cv.c
+       $(CC) $(COPTIONS) -DMACH=1 -I$(TARGET_HOME)/h -c $(SRC_DIR)/cv.c
+
+install:       all
+       cp cv $(TARGET_HOME)/lib.bin/sun2/cv
+
+cmp:   all
+       -cmp cv $(TARGET_HOME)/lib.bin/sun2/cv
+
+clean:
+       rm -f *.(SUF) Out
+
+lint:
+       $(LINT) $(LINTOPTIONS) -DMACH=1 -I$(TARGET_HOME)/h $(SRC_DIR)/cv.c $(UTIL_HOME)/modules/lib/$(LINTPREF)object.$(LINTSUF)
+
+pr:
+       @pr $(SRC_DIR)/mach/sun2/cv/proto.make $(SRC_DIR)/cv.c
+
+opr:
+       make pr | opr

diff --git a/mach/sun2/mach_params b/mach/sun2/mach_params
new file mode 100644 (file)
index 0000000..a66b9e0
--- /dev/null
+++ b/mach/sun2/mach_params
@@ -0,0 +1,4 @@
+MACH=sun2
+SUF=o
+ASAR=aal
+RANLIB=:

diff --git a/mach/sun3/.distr b/mach/sun3/.distr
index 17b6d54..4a7bd5c 100644 (file)
--- a/mach/sun3/.distr
+++ b/mach/sun3/.distr
@@ -1,9 +1,5 @@
 Action
 cv
 libsys
-libcc
-libcc.ansi
-liboc
-libm2
 ce
-libce
+mach_params

diff --git a/mach/sun3/Action b/mach/sun3/Action
index bb90f86..3261a97 100644 (file)
--- a/mach/sun3/Action
+++ b/mach/sun3/Action
@@ -4,16 +4,3 @@ end
 name "Sun 3 M68020 systemcall library"
 dir libsys
 end
-name "Sun 3 M68020 C libraries"
-dir libcc
-end
-name "Sun 3 M68020 ANSI-C libraries"
-dir libcc.ansi
-end
-name "Sun 3 M68020 Occam libraries"
-system "sun*|vax_bsd4_2"
-dir liboc
-end
-name "Sun 3 M68020 Modula-2 libraries"
-dir libm2
-end

diff --git a/mach/sun3/libsys/.distr b/mach/sun3/libsys/.distr
index 207f738..52a9f74 100644 (file)
--- a/mach/sun3/libsys/.distr
+++ b/mach/sun3/libsys/.distr
@@ -1,6 +1,4 @@
 LIST
-Makefile
-compmodule
 head_em.s
 libmon_s.a
 syscall.h

diff --git a/mach/sun3/mach_params b/mach/sun3/mach_params
new file mode 100644 (file)
index 0000000..10f5929
--- /dev/null
+++ b/mach/sun3/mach_params
@@ -0,0 +1,5 @@
+MACH=sun3
+SUF=o
+ASAR=aal
+RANLIB=:
+MACHFL=-DNFS

diff --git a/mach/vax4/top/.distr b/mach/vax4/top/.distr
index 2c8a26d..ecbe2e6 100644 (file)
--- a/mach/vax4/top/.distr
+++ b/mach/vax4/top/.distr
@@ -1,2 +1 @@
-Makefile
 table