--- projects/cms/source/server/Makefile	2001/01/02 04:06:57	1.11
+++ projects/cms/source/server/Makefile	2001/01/16 01:35:35	1.13
@@ -1,5 +1,5 @@
 # Makefile for server
-# $Id: Makefile,v 1.11 2001/01/02 04:06:57 tdb Exp $
+# $Id: Makefile,v 1.13 2001/01/16 01:35:35 tdb Exp $
 
 include Config.inc
 
@@ -11,10 +11,10 @@ genidl :
 buildidl : genidl
 	cd idl && $(MAKE) build
 
-code : buildidl
+code : genidl
 	cd uk/ac/ukc/iscream && $(MAKE) all
 
-build : code
+build : buildidl code
 	cd build && $(MAKE) package
 
 run : build
@@ -60,7 +60,11 @@ javadoc : genidl
 	if test ! -d "$(DOCTMPDIR)"; then mkdir $(DOCTMPDIR); fi
 	cp -R $(SERVERROOT)/uk $(SERVERROOT)/$(DOCTMPDIR)
 	cp -R $(SERVERROOT)/idl/uk $(SERVERROOT)/$(DOCTMPDIR)
-	javadoc -d $(SERVERROOT)/$(DOCDIR) -sourcepath $(SERVERROOT)/$(DOCTMPDIR) -author -version -private $(PKGLIST)
+	javadoc -d $(SERVERROOT)/$(DOCDIR) -sourcepath $(SERVERROOT)/$(DOCTMPDIR) -classpath $(JCCLASSPATH) -author -version -private $(PKGLIST)
 	rm -Rf doctemp
+
+buildutil : genidl
+	cd uk/ac/ukc/iscream/util && $(MAKE) all
+	cd build && $(MAKE) packageutil
 
 include $(MKINC)