--- projects/cms/source/server/Makefile	2001/01/02 04:06:57	1.11
+++ projects/cms/source/server/Makefile	2001/02/28 11:46:42	1.18
@@ -1,5 +1,5 @@
 # Makefile for server
-# $Id: Makefile,v 1.11 2001/01/02 04:06:57 tdb Exp $
+# $Id: Makefile,v 1.18 2001/02/28 11:46:42 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
@@ -45,22 +45,31 @@ install : build
 	mkdir -p $(INSTALL)/etc
 	cp $(BUILD)/etc/default.properties $(INSTALL)/etc
 	cp $(BUILD)/etc/*.conf $(INSTALL)/etc
+	@echo "  copying scripts to $(INSTALL)"
+	cp $(BUILD)/run.sh $(INSTALL)
+	cp $(BUILD)/run.bat $(INSTALL)
 	@echo "Completed install to $(INSTALL)"
 	@echo "-------------------------------------------------------"
 
 cvsbuild :
-	cvs -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
+	$(CVS) -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
 	cd $(CVSBUILDTEMP) && ./configure
+	cd $(CVSBUILDTEMP) && $(MAKE) buildutil
 	cd $(CVSBUILDTEMP) && $(MAKE) build
 	cp $(CVSBUILDTEMP)/build/$(TARGZFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(TARGZEXT)
 	cp $(CVSBUILDTEMP)/build/$(ZIPFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(ZIPEXT)
+	cp $(CVSBUILDTEMP)/build/$(UTILPACKAGE) $(BUILD)
 
 javadoc : genidl
 	if test ! -d "$(DOCDIR)"; then mkdir $(DOCDIR); fi
 	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 : clean
+	cd uk/ac/ukc/iscream/util && $(MAKE) all
+	cd build && $(MAKE) packageutil
 
 include $(MKINC)