--- projects/cms/source/server/idl/Makefile	2000/12/12 02:45:56	1.1.2.4
+++ projects/cms/source/server/idl/Makefile	2001/03/14 23:25:20	1.7
@@ -1,8 +1,10 @@
 # Makefile for idl
-# $Id: Makefile,v 1.1.2.4 2000/12/12 02:45:56 tdb Exp $
+# $Id: Makefile,v 1.7 2001/03/14 23:25:20 tdb Exp $
 
 include ../Config.inc
 
+IDLFILES = uk
+
 all : build
 
 idl : $(IDLCHECK)
@@ -11,13 +13,19 @@ $(IDLCHECK) : iscream.idl
 	java -classpath $(BUILD)/lib/idl.jar jacorb.idl.parser iscream.idl
 	@touch $(IDLCHECK)
 
-build : idl
-	cd uk/ac/ukc/iscream/clientinterface && javac -g:none -O -d $(BUILD) *.java
-	cd uk/ac/ukc/iscream/core && javac -g:none -O -d $(BUILD) *.java
-	cd uk/ac/ukc/iscream/filter && javac -g:none -O -d $(BUILD) *.java
+build : $(BUILDCHECK)
 
+$(BUILDCHECK) : $(IDLCHECK) iscream.idl
+	cd uk/org/iscream/clientinterface && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
+	cd uk/org/iscream/core && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
+	cd uk/org/iscream/filter && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
+	cd uk/org/iscream/client && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
+	cd $(SOURCEROOT)/uk/org/iscream && $(MAKE) clean
+	@touch $(BUILDCHECK)
+
 clean :
 	rm -Rf $(IDLFILES)
 	rm -f $(IDLCHECK)
+	rm -f $(BUILDCHECK)
 
-include $(MKINC)
+#include $(MKINC)