--- projects/cms/source/server/Makefile	2000/11/14 02:41:04	1.1
+++ projects/cms/source/server/Makefile	2000/12/12 12:36:04	1.6.2.6
@@ -1,21 +1,29 @@
 # Makefile for server
-# $Id: Makefile,v 1.1 2000/11/14 02:41:04 tdb Exp $
+# $Id: Makefile,v 1.6.2.6 2000/12/12 12:36:04 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 && java -jar iscream.jar
+
 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)
 
+include $(MKINC)