New installation mechanism

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

diff --git a/mach/proto/libg/.distr b/mach/proto/libg/.distr
index 5406365..7720d6a 100644 (file)
--- a/mach/proto/libg/.distr
+++ b/mach/proto/libg/.distr
@@ -8,5 +8,6 @@ proto.libsys
 proto.libcc.ansi
 proto.libmon
 proto.libem
+proto.libend
 proto.liboc
 proto.make

diff --git a/mach/proto/libg/proto.libem b/mach/proto/libg/proto.libem
index 44f250e..d078fff 100644 (file)
--- a/mach/proto/libg/proto.libem
+++ b/mach/proto/libg/proto.libem
@@ -6,24 +6,24 @@
 
 SRC_DIR =      $(SRC_HOME)/mach/$(MACH)/libem
 
-all:           libem
+all:           libem_o.a
 
-libem:         $(SRC_DIR)/libem_s.a
+libem_o.a:     $(SRC_DIR)/libem_s.a
                ASAR="$(ASAR)" ; export ASAR ; \
                RANLIB="$(RANLIB)" ; export RANLIB ; \
                MACH="$(MACH)" ; export MACH ; \
                MACHFL="$(MACHFL)" ; export MACHFL ; \
-               if [ $(SUF) = o ] march $(SRC_DIR) libem $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libem_s.a libem ; fi
+               if [ $(SUF) = o ] ; then march $(SRC_DIR) libem_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libem_s.a libem_o.a ; fi
 
 install:       all
-               cp libem $(TARGET_HOME)/lib/$(MACH)/tail_em
+               cp libem_o.a $(TARGET_HOME)/lib/$(MACH)/tail_em
                $(RANLIB) $(TARGET_HOME)/lib/$(MACH)/tail_em
 
 cmp:           all
-               -cmp libem $(TARGET_HOME)/lib/$(MACH)/tail_em
+               -cmp libem_o.a $(TARGET_HOME)/lib/$(MACH)/tail_em
 
 clean:
-               -rm -f *.old *.[ce$(SUF)] libem
+               -rm -f *.old *.[ce$(SUF)] libem_o.a
 
 opr:
                make pr | opr

diff --git a/mach/proto/libg/proto.libend b/mach/proto/libg/proto.libend
new file mode 100644 (file)
index 0000000..254035f
--- /dev/null
+++ b/mach/proto/libg/proto.libend
@@ -0,0 +1,32 @@
+# $Header$
+
+#PARAMS                do not remove this line!
+
+#MACH_PARAMS   do not remove this line!
+
+SRC_DIR =      $(SRC_HOME)/mach/$(MACH)/libend
+
+all:           end_o.a
+
+end_o.a:       $(SRC_DIR)/end_s.a
+               ASAR="$(ASAR)" ; export ASAR ; \
+               RANLIB="$(RANLIB)" ; export RANLIB ; \
+               MACH="$(MACH)" ; export MACH ; \
+               MACHFL="$(MACHFL)" ; export MACHFL ; \
+               if [ $(SUF) = o ] march $(SRC_DIR) end_o.a $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/end_s.a end_o.a ; fi
+
+install:       all
+               cp end_o.a $(TARGET_HOME)/lib/$(MACH)/end_em
+               $(RANLIB) $(TARGET_HOME)/lib/$(MACH)/end_em
+
+cmp:           all
+               -cmp end_o.a $(TARGET_HOME)/lib/$(MACH)/end_em
+
+clean:
+               -rm -f *.old *.[ce$(SUF)] end_o.a
+
+opr:
+               make pr | opr
+
+pr:
+               arch pv $(SRC_DIR)/end_s.a | pr -h $(SRC_DIR)/end_s.a

diff --git a/mach/proto/libg/proto.libmon b/mach/proto/libg/proto.libmon
index 42d13db..b720b1b 100644 (file)
--- a/mach/proto/libg/proto.libmon
+++ b/mach/proto/libg/proto.libmon
@@ -4,38 +4,36 @@
 
 #MACH_PARAMS   do not remove this line!
 
-MACHDEF= \
-       "MACH=$(MACH)" \
-       "SUF=$(SUF)" \
-       "ASAR=$(ASAR)" \
-       "RANLIB=$(RANLIB)" \
-       "SRC_HOME=$(SRC_HOME)" \
-       "TARGET_HOME=$(TARGET_HOME)" \
-       "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
+SRC_DIR =      $(SRC_HOME)/mach/$(MACH)/libmon
 
-MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
-MON="PREF=mon" "SUB=" "SRC=lang/cem/libcc/mon"
+all:           libmon head
 
-all:           mon
+libmon:                $(SRC_DIR)/libmon_s.a
+               ASAR="$(ASAR)" ; export ASAR ; \
+               RANLIB="$(RANLIB)" ; export RANLIB ; \
+               MACH="$(MACH)" ; export MACH ; \
+               MACHFL="$(MACHFL)" ; export MACHFL ; \
+               if [ $(SUF) = o ] march $(SRC_DIR) libmon $(SRC_HOME)/mach/proto/libg/compmodule ; else cp $(SRC_DIR)/libmon_s.a libmon ; fi
 
-mon:
-               make -f $(MAKEFILE) $(MON) $(MACHDEF) tail
+head:          $(SRC_DIR)/head_em.s
+               $(MACH) $(MACHFL) $(SRC_DIR)/head_em.s
+               mv head_em.$(SUF) head
 
-install:       cpmon
+install:       all
+               cp libmon $(TARGET_HOME)/lib/$(MACH)/tail_mon2
+               $(RANLIB) $(TARGET_HOME)/lib/$(MACH)/tail_mon2
+               cp head $(TARGET_HOME)/lib/$(MACH)/head_em
 
-cpmon:
-               make -f $(MAKEFILE) $(MON) $(MACHDEF) tailcp
-
-cmp:           cmpmon
-
-cmpmon:                mon
-               -cmp tail_mon $(TARGET_HOME)/lib/$(MACH)/tail_mon
+cmp:           all
+               -cmp libmon $(TARGET_HOME)/lib/$(MACH)/tail_mon2
+               -cmp head $(TARGET_HOME)/lib/$(MACH)/head_em
 
 clean:
-               -rm -f *.old *.[ce$(SUF)] tail* head*
+               -rm -f *.old *.[ce$(SUF)] head libmon
 
 opr:
-               @echo "nothing to be printed"
+               make pr | opr
 
 pr:
-               @echo "nothing to be printed"
+               @pr $(SRC_DIR)/head_em.s
+               @arch pv $(SRC_DIR)/libmon_s.a | pr -h $(SRC_DIR)/libmon_s.a

diff --git a/mach/proto/libg/proto.sysmon b/mach/proto/libg/proto.sysmon
new file mode 100644 (file)
index 0000000..42d13db
--- /dev/null
+++ b/mach/proto/libg/proto.sysmon
@@ -0,0 +1,41 @@
+# $Header$
+
+#PARAMS                do not remove this line!
+
+#MACH_PARAMS   do not remove this line!
+
+MACHDEF= \
+       "MACH=$(MACH)" \
+       "SUF=$(SUF)" \
+       "ASAR=$(ASAR)" \
+       "RANLIB=$(RANLIB)" \
+       "SRC_HOME=$(SRC_HOME)" \
+       "TARGET_HOME=$(TARGET_HOME)" \
+       "COMPILE=$(SRC_HOME)/mach/proto/libg/compmodule"
+
+MAKEFILE=$(SRC_HOME)/mach/proto/libg/Makefile
+MON="PREF=mon" "SUB=" "SRC=lang/cem/libcc/mon"
+
+all:           mon
+
+mon:
+               make -f $(MAKEFILE) $(MON) $(MACHDEF) tail
+
+install:       cpmon
+
+cpmon:
+               make -f $(MAKEFILE) $(MON) $(MACHDEF) tailcp
+
+cmp:           cmpmon
+
+cmpmon:                mon
+               -cmp tail_mon $(TARGET_HOME)/lib/$(MACH)/tail_mon
+
+clean:
+               -rm -f *.old *.[ce$(SUF)] tail* head*
+
+opr:
+               @echo "nothing to be printed"
+
+pr:
+               @echo "nothing to be printed"