diff --git a/mach/6500/as/Makefile b/mach/6500/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/6500/as/Makefile
+++ b/mach/6500/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/6800/as/Makefile b/mach/6800/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/6800/as/Makefile
+++ b/mach/6800/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/6805/as/Makefile b/mach/6805/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/6805/as/Makefile
+++ b/mach/6805/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/6809/as/Makefile b/mach/6809/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/6809/as/Makefile
+++ b/mach/6809/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/arm/as/Makefile b/mach/arm/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/arm/as/Makefile
+++ b/mach/arm/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/i386/as/Makefile b/mach/i386/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/i386/as/Makefile
+++ b/mach/i386/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/i80/as/Makefile b/mach/i80/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/i80/as/Makefile
+++ b/mach/i80/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/i86/as/Makefile b/mach/i86/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/i86/as/Makefile
+++ b/mach/i86/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/m68020/as/Makefile b/mach/m68020/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/m68020/as/Makefile
+++ b/mach/m68020/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/m68k2/as/Makefile b/mach/m68k2/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/m68k2/as/Makefile
+++ b/mach/m68k2/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/ns/as/Makefile b/mach/ns/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/ns/as/Makefile
+++ b/mach/ns/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/pdp/as/Makefile b/mach/pdp/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/pdp/as/Makefile
+++ b/mach/pdp/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/proto/as/Makefile b/mach/proto/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/proto/as/Makefile
+++ b/mach/proto/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/s2650/as/Makefile b/mach/s2650/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/s2650/as/Makefile
+++ b/mach/s2650/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/vax4/as/Makefile b/mach/vax4/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/vax4/as/Makefile
+++ b/mach/vax4/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/z80/as/Makefile b/mach/z80/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/z80/as/Makefile
+++ b/mach/z80/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h
diff --git a/mach/z8000/as/Makefile b/mach/z8000/as/Makefile
index 695d2b20e..becc0d3d2 100644
--- a/mach/z8000/as/Makefile
+++ b/mach/z8000/as/Makefile
@@ -1,12 +1,14 @@
 # $Header$
 EM	= ../../..
 h	= $(EM)/h
+LIBOBJ	= $(EM)/modules/lib/libobject.a
 CDIR	= $(EM)/mach/proto/nas
 CPP	= $(EM)/lib/cpp
 DEF	=
 
 FFLAG	=
-CFLAGS	= $(FFLAG) -O -I. -I$h $(DEF)
+INCL	= -I. -I$h $(DEF)
+CFLAGS	= $(FFLAG) -O $(INCL)
 YFLAGS	= -d
 LDFLAGS	= $(FFLAG) -i
 
@@ -34,14 +36,14 @@ pr:	$(MACH)
 opr:
 	make pr | opr
 as:	$(COBJ) as.o
-	$(CC) $(LDFLAGS) $(COBJ) as.o -o as
+	$(CC) $(LDFLAGS) $(COBJ) as.o $(LIBOBJ) -o as
 
 as.y:	$(CDIR)/comm2.y
 	$(CPP) -P -I. -I$h $(DEF) $(CDIR)/comm2.y >as.y
 	@echo "expect 1 shift/reduce conflict"
 
 lint:   $(CSRC) as.c
-	lint $(CSRC) as.c
+	lint $(INCL) $(CSRC) as.c
 
 y.tab.h:	as.c
 $(COBJ):	y.tab.h