--- projects/cms/source/server/Makefile.inc	2000/12/12 02:45:54	1.1.2.4
+++ projects/cms/source/server/Makefile.inc	2003/01/26 14:02:52	1.13
@@ -1,24 +1,28 @@
 # Include Makefile for the server
-# $Id: Makefile.inc,v 1.1.2.4 2000/12/12 02:45:54 tdb Exp $
+# $Id: Makefile.inc,v 1.13 2003/01/26 14:02:52 tdb Exp $
 
 ## Rule to CVS update the files
 update :
-	cvs -q -d $(CVSROOT) update
+	$(CVS) -q -d $(CVSROOT) update
 
-## How to generate the IDL files
-IDLMAKE = cd $(SERVERROOT) && $(MAKE) buildidl
+## Rule for making and compiling the IDL files
+#$(IDLCHECK) : $(SOURCEROOT)/idl/iscream.idl
+#	cd $(SOURCEROOT)/idl && $(MAKE) build
+#	rm -f $(COMPILECHECK)
 
-## Rule for making the IDL files
-$(IDL) : $(SERVERROOT)/idl/iscream.idl
-	$(IDLMAKE)
-
 ## General Build Rule for Java Files
-DOBUILD : $(COMPILECHECK) $(IDL)
+DOBUILD : $(IDLCHECK) $(COMPILECHECK)
 
 $(COMPILECHECK) : $(JAVA)
-	javac -g:none -O -classpath $(JCCLASSPATH) -d $(BUILD) $?
+	$(JAVACBIN) $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) $?
 	@touch $(BUILDCHECK)
 	@touch $(COMPILECHECK)
 
 DOCLEAN :
-	rm -f $(COMPILECHECK)
+	rm -f $(COMPILECHECK) $(COPYCHECK)
+
+DOCOPY : $(COPYCHECK)
+
+$(COPYCHECK) : $(FILES)
+	cp $(FILES) `perl -e '$$root="$(SOURCEROOT)";$$path=\`pwd\`;$$path=~s/^$$root($$1)/$$1/;print "$(BUILD)".$$path;'`
+	@touch $(COPYCHECK)