--- projects/cms/source/server/Makefile	2000/12/06 16:45:08	1.6
+++ projects/cms/source/server/Makefile	2001/01/16 01:35:35	1.13
@@ -1,44 +1,70 @@
 # Makefile for server
-# $Id: Makefile,v 1.6 2000/12/06 16:45:08 tdb Exp $
+# $Id: Makefile,v 1.13 2001/01/16 01:35:35 tdb Exp $
 
-IDL = idl/.madeidl
+include Config.inc
 
-all : idl code
+all : build
 
-idl : $(IDL)
-$(IDL) : idl/iscream.idl
-	cd idl && $(MAKE) all
+genidl :
+	cd idl && $(MAKE) idl
 
-code :
+buildidl : genidl
+	cd idl && $(MAKE) build
+
+code : genidl
 	cd uk/ac/ukc/iscream && $(MAKE) all
 
+build : buildidl code
+	cd build && $(MAKE) package
+
+run : build
+	cd build && ./run.sh
+
 clean :
 	cd idl && $(MAKE) clean
+	cd build && $(MAKE) clean
 	cd uk/ac/ukc/iscream && $(MAKE) clean
+	rm -Rf $(BUILDCHECK) $(IDLCHECK)
+	rm -Rf $(CVSBUILDTEMP)
+	rm -Rf doc doctemp
 
-update :
-	cvs -q -d /usr/local/proj/co600_10/cvs update
+distclean : clean
+	cd $(BUILD) && rm -f $(CLPATH)
+	rm -f Config.inc
 
-runclientinterface :
-	cd uk/ac/ukc/iscream/clientinterface && $(MAKE) all
-	java uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain
+install : build
+	@echo "-------------------------------------------------------"
+	@echo "Installing to $(INSTALL)"
+	@echo "  copying $(PACKAGE) to $(INSTALL)"
+	mkdir -p $(INSTALL)
+	cp $(BUILD)/$(PACKAGE) $(INSTALL)
+	@echo "  copying libs to $(INSTALL)/lib"
+	mkdir -p $(INSTALL)/lib
+	cp $(LIBDIR)/*.jar $(INSTALL)/lib
+	@echo "  copying etc to $(INSTALL)/etc"
+	mkdir -p $(INSTALL)/etc
+	cp $(BUILD)/etc/default.properties $(INSTALL)/etc
+	cp $(BUILD)/etc/*.conf $(INSTALL)/etc
+	@echo "Completed install to $(INSTALL)"
+	@echo "-------------------------------------------------------"
 
-runcore :
-	cd uk/ac/ukc/iscream/core && $(MAKE) all
-	java uk.ac.ukc.iscream.core.Core -l etc/default.properties
+cvsbuild :
+	cvs -d $(CVSROOT) export -r $(REVISION) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
+	cd $(CVSBUILDTEMP) && ./configure
+	cd $(CVSBUILDTEMP) && $(MAKE) build
+	cp $(CVSBUILDTEMP)/build/$(TARGZFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(TARGZEXT)
+	cp $(CVSBUILDTEMP)/build/$(ZIPFILE) $(BUILD)/$(ARCNAME)-$(REVISION)$(ZIPEXT)
 
-rundbinterface :
-	cd uk/ac/ukc/iscream/dbinterface && $(MAKE) all
-	java uk.ac.ukc.iscream.dbinterface.DBInterfaceMain
+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) -classpath $(JCCLASSPATH) -author -version -private $(PKGLIST)
+	rm -Rf doctemp
 
-runfiltermanager :
-	cd uk/ac/ukc/iscream/filtermanager && $(MAKE) all
-	java uk.ac.ukc.iscream.filtermanager.FilterManager
+buildutil : genidl
+	cd uk/ac/ukc/iscream/util && $(MAKE) all
+	cd build && $(MAKE) packageutil
 
-runrootfilter :
-	cd uk/ac/ukc/iscream/rootfilter && $(MAKE) all
-	java uk.ac.ukc.iscream.rootfilter.RootFilterMain
-
-runfilter :
-	cd uk/ac/ukc/iscream/filter && $(MAKE) all
-	java uk.ac.ukc.iscream.filter.FilterMain $(NAME)
+include $(MKINC)