--- projects/cms/source/server/Makefile.inc	2000/12/11 23:57:06	1.1.2.2
+++ projects/cms/source/server/Makefile.inc	2001/02/28 11:46:42	1.7
@@ -1,17 +1,28 @@
 # Include Makefile for the server
-# $Id: Makefile.inc,v 1.1.2.2 2000/12/11 23:57:06 tdb Exp $
+# $Id: Makefile.inc,v 1.7 2001/02/28 11:46:42 tdb Exp $
 
 ## Rule to CVS update the files
 update :
-	cvs -q -d $(CVSROOT) update
+	$(CVS) -q -d $(CVSROOT) update
 
-## General rule for building a class file
-%.class : %.java
-	javac -g:none -O -d $(BUILD) $<
+## Rule for making and compiling the IDL files
+$(IDLCHECK) : $(SERVERROOT)/idl/iscream.idl
+	cd $(SERVERROOT)/idl && $(MAKE) build
+	rm -f $(COMPILECHECK)
 
-## How to generate the IDL files
-IDLMAKE = cd $(SERVERROOT) && $(MAKE) buildidl
+## General Build Rule for Java Files
+DOBUILD : $(IDLCHECK) $(COMPILECHECK)
 
-## Rule for making the IDL files
-$(IDL) : $(SERVERROOT)/idl/iscream.idl
-	$(IDLMAKE)
+$(COMPILECHECK) : $(JAVA)
+	javac -g:none -O -classpath $(JCCLASSPATH) -d $(BUILD) $?
+	@touch $(BUILDCHECK)
+	@touch $(COMPILECHECK)
+
+DOCLEAN :
+	rm -f $(COMPILECHECK) $(COPYCHECK)
+
+DOCOPY : $(COPYCHECK)
+
+$(COPYCHECK) : $(FILES)
+	cp $(FILES) `perl -e '$$root="$(SERVERROOT)";$$path=\`pwd\`;$$path=~s/^$$root($$1)/$$1/;print "$(BUILD)".$$path;'`
+	@touch $(COPYCHECK)