--- projects/cms/source/server/Makefile.inc 2000/12/12 12:36:59 1.1.2.5 +++ projects/cms/source/server/Makefile.inc 2002/06/07 16:12:47 1.12 @@ -1,22 +1,28 @@ # 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.12 2002/06/07 16:12:47 tdb Exp $ ## Rule to CVS update the files 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 +$(IDLCHECK) : $(SOURCEROOT)/idl/iscream.idl + cd $(SOURCEROOT)/idl && $(MAKE) build rm -f $(COMPILECHECK) ## General Build Rule for Java Files 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)