--- projects/cms/source/server/Makefile	2000/12/12 01:59:34	1.6.2.4
+++ projects/cms/source/server/Makefile	2000/12/13 18:34:09	1.8
@@ -1,29 +1,57 @@
 # Makefile for server
-# $Id: Makefile,v 1.6.2.4 2000/12/12 01:59:34 tdb Exp $
+# $Id: Makefile,v 1.8 2000/12/13 18:34:09 tdb Exp $
 
 include Config.inc
 
-all : buildidl code build
+all : build
 
-idl : $(IDL)
-$(IDL) : idl/iscream.idl
+idl :
 	cd idl && $(MAKE) idl
 
-buildidl : $(IDL) idl
+buildidl : idl
 	cd idl && $(MAKE) build
 
-code :
+code : buildidl
 	cd uk/ac/ukc/iscream && $(MAKE) all
 
+build : code
+	cd build && $(MAKE) package
+
+run : build
+	cd build && java -jar iscream.jar -f filter1
+
 clean :
 	cd idl && $(MAKE) clean
 	cd build && $(MAKE) clean
+	cd uk/ac/ukc/iscream && $(MAKE) clean
 	rm -Rf $(BUILDCHECK) $(IDLCHECK)
+	rm -Rf $(CVSBUILDTEMP)
 
-run : build
-	cd build && java -jar iscream.jar
+distclean : clean
+	rm -f $(CLPATH)
+	rm -f Config.inc
 
-build :
-	cd build && $(MAKE) package
+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 "-------------------------------------------------------"
+
+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)
 
 include $(MKINC)