--- projects/cms/source/server/Makefile	2000/12/11 23:43:50	1.6.2.2
+++ projects/cms/source/server/Makefile	2000/12/13 17:35:00	1.6.2.8
@@ -1,28 +1,49 @@
 # Makefile for server
-# $Id: Makefile,v 1.6.2.2 2000/12/11 23:43:50 tdb Exp $
+# $Id: Makefile,v 1.6.2.8 2000/12/13 17:35:00 tdb Exp $
 
 include Config.inc
 
-all : buildidl code
+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
+
 clean :
 	cd idl && $(MAKE) clean
 	cd build && $(MAKE) clean
+	cd uk/ac/ukc/iscream && $(MAKE) clean
+	rm -Rf $(BUILDCHECK) $(IDLCHECK)
 
-run : build
-	cd build && java -jar iscream.jar
+distclean : clean
+	rm -f $(CLPATH)
+	rm -f Config.inc
 
-build : all
-	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 "-------------------------------------------------------"
 
 include $(MKINC)