--- projects/cms/source/server/Makefile	2000/11/14 02:41:04	1.1
+++ projects/cms/source/server/Makefile	2000/12/14 19:54:29	1.10
@@ -1,21 +1,57 @@
 # Makefile for server
-# $Id: Makefile,v 1.1 2000/11/14 02:41:04 tdb Exp $
+# $Id: Makefile,v 1.10 2000/12/14 19:54:29 tdb Exp $
 
-all : idl core filter
+include Config.inc
 
-core :
-	cd CORE && $(MAKE)
+all : build
 
-filter :
-	cd Filter && $(MAKE)
+idl :
+	cd idl && $(MAKE) idl
 
-idl : iscream.idl
-	idl iscream.idl
-	@touch .madeidl
+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 && ./run.sh
+
 clean :
-	rm -Rf uk
-	rm -f .madeidl
-	cd CORE && $(MAKE) clean
-	cd Filter && $(MAKE) 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
+	cd $(BUILD) && rm -f $(CLPATH)
+	rm -f Config.inc
+
+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)