--- projects/cms/source/server/Makefile.inc	2000/12/12 12:36:59	1.1.2.5
+++ projects/cms/source/server/Makefile.inc	2003/02/01 19:08:54	1.14
@@ -1,22 +1,42 @@
 # Include Makefile for the server
-# $Id: Makefile.inc,v 1.1.2.5 2000/12/12 12:36:59 tdb Exp $
+# $Id: Makefile.inc,v 1.14 2003/02/01 19:08:54 tdb Exp $
 
 ## Rule to CVS update the files
+.PHONY : update
 update :
-	cvs -q -d $(CVSROOT) update
+	$(CVS) -q -d $(CVSROOT) update
 
-## Rule for making and compiling the IDL files
-$(IDLCHECK) : $(SERVERROOT)/idl/iscream.idl
-	cd $(SERVERROOT)/idl && $(MAKE) build
-	rm -f $(COMPILECHECK)
-
 ## General Build Rule for Java Files
-DOBUILD : $(IDLCHECK) $(COMPILECHECK)
+.PHONY : DOBUILD
+DOBUILD : $(COMPILECHECK)
 
-$(COMPILECHECK) : $(JAVA)
-	javac -g:none -O -classpath $(JCCLASSPATH) -d $(BUILD) $?
-	@touch $(BUILDCHECK)
+$(COMPILECHECK) : $(JAVA) $(IDLCHECK)
+	$(JAVACBIN) $(JCFLAGS) -classpath $(JCCLASSPATH) -d $(BUILD) $(JAVA)
 	@touch $(COMPILECHECK)
+	@touch $(MCOMPILECHECK)
 
+.PHONY : DOCOPY
+DOCOPY : $(COPYCHECK)
+
+$(COPYCHECK) : $(FILES)
+	cp $(FILES) `perl -e '$$root="$(SOURCEROOT)";$$path=\`pwd\`;$$path=~s/^$$root($$1)/$$1/;print "$(BUILD)".$$path;'`
+	@touch $(COPYCHECK)
+
+.PHONY : DOCLEAN
 DOCLEAN :
-	rm -f $(COMPILECHECK)
+	rm -f $(COMPILECHECK) $(COPYCHECK)
+
+$(IDLCHECK) : $(IDLFILE)
+	cd $(IDLDIR) && $(MAKE) all
+
+$(MCOMPILECHECK) :
+	cd $(SOURCEROOT) && $(MAKE) build
+
+$(SRCCHECK) :
+	cd $(SOURCEROOT) && $(MAKE) mksrc
+
+$(CHANGELOG) :
+	cd $(SOURCEROOT) && $(MAKE) mkchangelog
+
+$(JAVADOCCHECK) : $(IDLCHECK)
+	cd $(SOURCEROOT) && $(MAKE) mkjavadoc