--- projects/cms/source/server/Makefile	2000/12/13 17:59:21	1.6.2.9
+++ projects/cms/source/server/Makefile	2000/12/11 17:20:44	1.7
@@ -1,57 +1,43 @@
 # Makefile for server
-# $Id: Makefile,v 1.6.2.9 2000/12/13 17:59:21 tdb Exp $
+# $Id: Makefile,v 1.7 2000/12/11 17:20:44 ajm Exp $
 
-include Config.inc
+IDL = idl/.madeidl
 
-all : build
+all : idl code
 
-idl :
-	cd idl && $(MAKE) idl
+idl : $(IDL)
+$(IDL) : idl/iscream.idl
+	cd idl && $(MAKE) all
 
-buildidl : idl
-	cd idl && $(MAKE) build
-
-code : buildidl
+code :
 	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)
 
-distclean : clean
-	rm -f $(CLPATH)
-	rm -f Config.inc
+update :
+	cvs -q -d /usr/local/proj/co600_10/cvs update
 
-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 "-------------------------------------------------------"
+runclientinterface :
+	cd uk/ac/ukc/iscream/clientinterface && $(MAKE) all
+	java uk.ac.ukc.iscream.clientinterface.ClientInterfaceMain
 
-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)
+run : all
+	java uk.ac.ukc.iscream.componentmanager.ComponentManager -l etc/default.properties
 
-include $(MKINC)
+rundbinterface :
+	cd uk/ac/ukc/iscream/dbinterface && $(MAKE) all
+	java uk.ac.ukc.iscream.dbinterface.DBInterfaceMain
+
+runfiltermanager :
+	cd uk/ac/ukc/iscream/filtermanager && $(MAKE) all
+	java uk.ac.ukc.iscream.filtermanager.FilterManager
+
+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)