--- projects/cms/source/server/uk/org/iscream/cms/server/core/Makefile	2000/11/29 23:40:55	1.12
+++ projects/cms/source/server/uk/org/iscream/cms/server/core/Makefile	2000/12/13 18:34:24	1.13
@@ -1,38 +1,26 @@
 # Makefile for uk.ac.ukc.iscream.core
-# $Id: Makefile,v 1.12 2000/11/29 23:40:55 tdb Exp $
+# $Id: Makefile,v 1.13 2000/12/13 18:34:24 tdb Exp $
 
-# Defining Filenames
+# Config Include
+include ../../../../../Config.inc
 
-CLASS = CircularIncludeException.class ConfigurationManagerServant.class\
-        ConfigurationServant.class Core.class\
-        LoggerImpl.class LoggerServant.class
+# Defining Filenames (these will all be built)
 
-IDL = ../../../../../idl/.madeidl
-IDLFILES = ../../../../../idl/uk
-IDLMAKE = cd ../../../../.. && $(MAKE) idl
+JAVA = CircularIncludeException.java ConfigurationManagerServant.java\
+       ConfigurationServant.java Core.java\
+       LoggerImpl.java LoggerServant.java
 
-# Defining "shortcuts" for building
-
+# Build Rules
 all : core loggers
 
-core : $(IDL) $(CLASS)
+core : DOBUILD
 
 loggers : mkloggers
 mkloggers :
 	cd loggers && $(MAKE) all
 
-clean :
-	rm -f $(CLASS)
+clean : DOCLEAN
 	cd loggers && $(MAKE) clean
 
-update :
-	cvs -q -d /usr/local/proj/co600_10/cvs update -d
-
-# Dependencies, and building
-
-# clever catchall to build any .class file from a .java file
-%.class : %.java
-	javac $<
-
-$(IDL) : ../../../../../idl/iscream.idl
-	$(IDLMAKE)
+# Main Include
+include $(MKINC)