--- projects/cms/source/server/idl/Makefile	2000/12/11 23:46:24	1.1.2.3
+++ projects/cms/source/server/idl/Makefile	2003/05/05 22:05:01	1.13
@@ -1,19 +1,26 @@
 # Makefile for idl
-# $Id: Makefile,v 1.1.2.3 2000/12/11 23:46:24 tdb Exp $
+# $Id: Makefile,v 1.13 2003/05/05 22:05:01 tdb Exp $
 
 include ../Config.inc
 
-idl : $(IDLCHECK)
+IDLFILES = uk
 
-$(IDLCHECK) : iscream.idl
-	java -classpath $(BUILD)/lib/idl.jar jacorb.idl.parser iscream.idl
-	@touch $(IDLCHECK)
+.PHONY : all
+all : build
 
+.PHONY : idl
+idl : iscream.idl
+	java -classpath $(BUILD)/lib/idl.jar org.jacorb.idl.parser -sloppy_names iscream.idl
+
+.PHONY : build
 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
+	cd uk/org/iscream/cms/server/clientinterface && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
+	cd uk/org/iscream/cms/server/core && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
+	cd uk/org/iscream/cms/server/filter && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
+	@touch $(IDLCHECK)
+	@rm -f $(MCOMPILECHECK)
 
+.PHONY : clean
 clean :
 	rm -Rf $(IDLFILES)
 	rm -f $(IDLCHECK)