--- projects/cms/source/server/idl/Makefile	2001/03/14 22:01:09	1.6
+++ projects/cms/source/server/idl/Makefile	2003/05/05 22:05:01	1.13
@@ -1,31 +1,28 @@
 # Makefile for idl
-# $Id: Makefile,v 1.6 2001/03/14 22:01:09 tdb Exp $
+# $Id: Makefile,v 1.13 2003/05/05 22:05:01 tdb Exp $
 
 include ../Config.inc
 
 IDLFILES = uk
 
+.PHONY : all
 all : build
 
-idl : $(IDLCHECK)
+.PHONY : idl
+idl : iscream.idl
+	java -classpath $(BUILD)/lib/idl.jar org.jacorb.idl.parser -sloppy_names iscream.idl
 
-$(IDLCHECK) : iscream.idl
-	java -classpath $(BUILD)/lib/idl.jar jacorb.idl.parser iscream.idl
+.PHONY : build
+build : idl
+	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)
 
-build : $(BUILDCHECK)
-
-$(BUILDCHECK) : $(IDLCHECK) iscream.idl
-	cd uk/ac/ukc/iscream/clientinterface && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
-	cd uk/ac/ukc/iscream/core && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
-	cd uk/ac/ukc/iscream/filter && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
-	cd uk/ac/ukc/iscream/client && javac $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) *.java
-	cd $(SOURCEROOT)/uk/ac/ukc/iscream && $(MAKE) clean
-	@touch $(BUILDCHECK)
-
+.PHONY : clean
 clean :
 	rm -Rf $(IDLFILES)
 	rm -f $(IDLCHECK)
-	rm -f $(BUILDCHECK)
 
-#include $(MKINC)
+include $(MKINC)