--- projects/cms/source/server/Makefile	2002/06/07 16:12:47	1.25
+++ projects/cms/source/server/Makefile	2003/01/26 14:02:52	1.26
@@ -1,5 +1,5 @@
 # Makefile for server
-# $Id: Makefile,v 1.25 2002/06/07 16:12:47 tdb Exp $
+# $Id: Makefile,v 1.26 2003/01/26 14:02:52 tdb Exp $
 
 include Config.inc
 
@@ -7,7 +7,8 @@ all : dist
 
 ### Code Building
 
-genidl :
+genidl : $(IDLCHECK)
+$(IDLCHECK) :
 	cd idl && $(MAKE) idl
 
 buildidl : genidl
@@ -19,22 +20,27 @@ build : buildidl
 
 ### Source, Doc, & Changelog
 
-src :
+src : $(SRCCHECK)
+$(SRCCHECK) :
 	if test ! -d "$(SRCDIR)"; then mkdir -p $(SRCDIR); fi
 	echo "CVS" > TAR_EXCLUDE_TMP
 	echo ".#*" >> TAR_EXCLUDE_TMP
 	tar -cf - -X TAR_EXCLUDE_TMP $(SRCFILES) | ( cd $(SRCDIR) && tar -xf - )
 	rm -f TAR_EXCLUDE_TMP
+	@touch $(SRCCHECK)
 
-javadoc : genidl
+javadoc : $(JAVADOCCHECK)
+$(JAVADOCCHECK) : $(IDLCHECK)
 	if test ! -d "$(DOCDIR)"; then mkdir -p $(DOCDIR); fi
 	if test ! -d "$(DOCTMPDIR)"; then mkdir -p $(DOCTMPDIR); fi
 	cp -R $(SOURCEROOT)/uk $(DOCTMPDIR)
 	cp -R $(SOURCEROOT)/idl/uk $(DOCTMPDIR)
-	$(JAVADOCBIN) -d $(DOCDIR) -sourcepath $(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -link $(JDJAPI) -link $(JDPBAPI) $(PKGLIST)
+	$(JAVADOCBIN) -d $(DOCDIR) -sourcepath $(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -linkoffline $(JDJAPI) $(JDJAPIC) -linkoffline $(JDPBAPI) $(JDPBAPIC) $(PKGLIST)
 	rm -Rf $(DOCTMPDIR)
+	@touch $(JAVADOCCHECK)
 
-changelog :
+changelog : $(CHANGELOG)
+$(CHANGELOG) :
 	$(CVS2CL) $(CVS2CLFLAGS) > $(CHANGELOG)
 
 ### Dist Making
@@ -63,13 +69,12 @@ clean :
 	cd idl && $(MAKE) clean
 	cd $(BUILD) && $(MAKE) clean ver=$(VERSION)
 	cd uk/org/iscream/cms/server && $(MAKE) clean
-	rm -Rf $(BUILDCHECK) $(IDLCHECK)
-	rm -Rf $(CVSBUILDTEMP)
-	rm -Rf $(DOCDIR) $(DOCTMPDIR)
-	rm -Rf $(SRCDIR)
+	rm -f $(BUILDCHECK) $(IDLCHECK) $(JAVADOCCHECK) $(SRCCHECK)
+	rm -Rf $(CVSBUILDTEMP) $(DOCTMPDIR)
 
 distclean : clean
 	cd $(BUILD) && rm -f $(CLPATH)
+	rm -Rf $(APICACHE)
 	rm -f Config.inc
 
 ### Util Package