--- projects/cms/source/server/Makefile	2000/11/29 23:39:03	1.3
+++ projects/cms/source/server/Makefile	2000/12/13 17:59:21	1.6.2.9
@@ -1,36 +1,57 @@
 # Makefile for server
-# $Id: Makefile,v 1.3 2000/11/29 23:39:03 tdb Exp $
+# $Id: Makefile,v 1.6.2.9 2000/12/13 17:59:21 tdb Exp $
 
-IDL = idl/.madeidl
+include Config.inc
 
-all : idl code
+all : build
 
-idl : $(IDL)
-$(IDL) : idl/iscream.idl
-	cd idl && $(MAKE) all
+idl :
+	cd idl && $(MAKE) idl
 
-code :
+buildidl : idl
+	cd idl && $(MAKE) build
+
+code : buildidl
 	cd uk/ac/ukc/iscream && $(MAKE) all
 
+build : code
+	cd build && $(MAKE) package
+
+run : build
+	cd build && java -jar iscream.jar
+
 clean :
 	cd idl && $(MAKE) clean
+	cd build && $(MAKE) clean
 	cd uk/ac/ukc/iscream && $(MAKE) clean
+	rm -Rf $(BUILDCHECK) $(IDLCHECK)
+	rm -Rf $(CVSBUILDTEMP)
 
-update :
-	cvs -q -d /usr/local/proj/co600_10/cvs update
+distclean : clean
+	rm -f $(CLPATH)
+	rm -f Config.inc
 
-runcore :
-	cd uk/ac/ukc/iscream/core && $(MAKE) all
-	java uk.ac.ukc.iscream.core.Core -l etc/default.properties
+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 "-------------------------------------------------------"
 
-runfiltermanager :
-	cd uk/ac/ukc/iscream/filtermanager && $(MAKE) all
-	java uk.ac.ukc.iscream.filtermanager.FilterManager
+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)
 
-runrootfilter :
-	cd uk/ac/ukc/iscream/rootfilter && $(MAKE) all
-	java uk.ac.ukc.iscream.rootfilter.RootFilterMain $(NAME)
-
-runfilter :
-	cd uk/ac/ukc/iscream/filter && $(MAKE) all
-	java uk.ac.ukc.iscream.filter.FilterMain $(NAME)
+include $(MKINC)