--- projects/cms/source/server/Makefile	2003/01/26 14:02:52	1.26
+++ projects/cms/source/server/Makefile	2003/02/16 00:48:29	1.34
@@ -1,120 +1,124 @@
 # Makefile for server
-# $Id: Makefile,v 1.26 2003/01/26 14:02:52 tdb Exp $
+# $Id: Makefile,v 1.34 2003/02/16 00:48:29 tdb Exp $
 
 include Config.inc
 
+.PHONY : all
 all : dist
 
 ### Code Building
 
-genidl : $(IDLCHECK)
-$(IDLCHECK) :
-	cd idl && $(MAKE) idl
-
-buildidl : genidl
-	cd idl && $(MAKE) build
-
-build : buildidl
+.PHONY : build
+build : $(IDLCHECK)
 	cd uk/org/iscream/cms/server && $(MAKE) all
 	cd $(BUILD) && $(MAKE) package
 
 ### Source, Doc, & Changelog
 
+.PHONY : src
 src : $(SRCCHECK)
-$(SRCCHECK) :
+
+.PHONY : mksrc
+mksrc :
 	if test ! -d "$(SRCDIR)"; then mkdir -p $(SRCDIR); fi
 	echo "CVS" > TAR_EXCLUDE_TMP
 	echo ".#*" >> TAR_EXCLUDE_TMP
+	echo "*.jar" >> TAR_EXCLUDE_TMP
+	echo ".done*" >> TAR_EXCLUDE_TMP
 	tar -cf - -X TAR_EXCLUDE_TMP $(SRCFILES) | ( cd $(SRCDIR) && tar -xf - )
 	rm -f TAR_EXCLUDE_TMP
 	@touch $(SRCCHECK)
 
+.PHONY : javadoc
 javadoc : $(JAVADOCCHECK)
-$(JAVADOCCHECK) : $(IDLCHECK)
+
+.PHONY : mkjavadoc
+mkjavadoc : $(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) -linkoffline $(JDJAPI) $(JDJAPIC) -linkoffline $(JDPBAPI) $(JDPBAPIC) $(PKGLIST)
+	$(JAVADOCBIN) -d $(DOCDIR) -sourcepath $(DOCTMPDIR) -classpath $(JCCLASSPATH) -windowtitle $(JDTITLE) -author -version -private -use -header $(JDHEADER) -bottom $(JDBOTTOM) -linkoffline $(JDJAPI) $(JDJAPIC) -linkoffline $(JDPBAPI) $(JDPBAPIC) -linkoffline $(JDUAPI) $(JDUAPIC) $(PKGLIST)
 	rm -Rf $(DOCTMPDIR)
 	@touch $(JAVADOCCHECK)
 
+.PHONY : changelog
 changelog : $(CHANGELOG)
-$(CHANGELOG) :
-	$(CVS2CL) $(CVS2CLFLAGS) > $(CHANGELOG)
 
+.PHONY : mkchangelog
+mkchangelog :
+	if [ -d $(SOURCEROOT)/CVS ]; then \
+		$(CVS2CL) $(CVS2CLFLAGS) > $(CHANGELOG); \
+	else \
+		echo "Can't generate ChangeLog from non-checked out copy." > $(CHANGELOG); \
+	fi
+
 ### Dist Making
 
-dist : build src javadoc changelog
-	cd $(BUILD) && $(MAKE) dist ver=$(VERSION) dest=$(DISTDEST)
+.PHONY : dist
+dist : 
+	cd $(BUILD) && $(MAKE) dist dest=$(DISTDEST)
 
-dist-bin : build changelog
-	cd $(BUILD) && $(MAKE) dist-bin ver=$(VERSION) dest=$(DISTDEST)
+.PHONY : dist-bin
+dist-bin :
+	cd $(BUILD) && $(MAKE) dist-bin dest=$(DISTDEST)
 
-### CVS Magic :)
-
-cvs-dist :
-	$(CVS) -d $(CVSROOT) export -r $(CVSTAG) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
-	cd $(CVSBUILDTEMP) && ./configure
-	cd $(CVSBUILDTEMP) && $(MAKE) dist ver=$(VERSION) dest=$(DISTDEST)
-
-cvs-dist-bin :
-	$(CVS) -d $(CVSROOT) export -r $(CVSTAG) -d $(CVSBUILDTEMP) $(CVSSERVERMODULE)
-	cd $(CVSBUILDTEMP) && ./configure
-	cd $(CVSBUILDTEMP) && $(MAKE) dist-bin ver=$(VERSION) dest=$(DISTDEST)
-
 ### Code Cleaning
 
+.PHONY : clean
 clean :
 	cd idl && $(MAKE) clean
 	cd $(BUILD) && $(MAKE) clean ver=$(VERSION)
 	cd uk/org/iscream/cms/server && $(MAKE) clean
-	rm -f $(BUILDCHECK) $(IDLCHECK) $(JAVADOCCHECK) $(SRCCHECK)
-	rm -Rf $(CVSBUILDTEMP) $(DOCTMPDIR)
+	rm -f $(MCOMPILECHECK) $(JAVADOCCHECK) $(SRCCHECK)
+	rm -Rf $(DOCTMPDIR)
 
+.PHONY : distclean
 distclean : clean
 	cd $(BUILD) && rm -f $(CLPATH)
 	rm -Rf $(APICACHE)
 	rm -f Config.inc
 
-### Util Package
-
-buildutil : clean
-	cd uk/org/iscream/cms/server/util && $(MAKE) all
-	cd $(BUILD) && $(MAKE) packageutil
-
 ### Database
 
+.PHONY : createtable
 createtable :
 	cd db && $(MAKE) create
 
+.PHONY : droptable
 droptable :
 	cd db && $(MAKE) drop
 
 ### Install
 
-install : build
+.PHONY : install
+install : $(MCOMPILECHECK) $(JAVADOCCHECK) $(CHANGELOG)
 	@echo "-------------------------------------------------------"
-	@echo "Installing to $(INSTALL)"
-	@echo "  copying $(PACKAGE) to $(INSTALL)"
-	mkdir -p $(INSTALL)
-	cp $(BUILD)/$(PACKAGE) $(INSTALL)
-	@echo "  copying libs to $(INSTALL)/lib"
-	mkdir -p $(INSTALL)/lib
-	cp $(LIBDIR)/*.jar $(INSTALL)/lib
-	@echo "  copying etc to $(INSTALL)/etc"
-	mkdir -p $(INSTALL)/etc
-	cp $(BUILD)/etc/default.properties $(INSTALL)/etc
-	cp $(BUILD)/etc/*.conf $(INSTALL)/etc
-	@echo "  copying scripts to $(INSTALL)"
-	cp $(BUILD)/run.sh $(INSTALL)
-	cp $(BUILD)/run.bat $(INSTALL)
-	@echo "Completed install to $(INSTALL)"
+	@echo "Installing to $(INSTALLPREFIX)"
+	@echo "  copying $(PACKAGE) to $(INSTALLPREFIX)"
+	@mkdir -p $(INSTALLPREFIX)
+	@cp $(BUILD)/$(PACKAGE) $(INSTALLPREFIX)
+	@echo "  copying libs to $(INSTALLPREFIX)/lib"
+	@mkdir -p $(INSTALLPREFIX)/lib
+	@cp $(LIBDIR)/*.jar $(INSTALLPREFIX)/lib
+	@echo "  copying etc to $(INSTALLPREFIX)/etc"
+	@mkdir -p $(INSTALLPREFIX)/etc
+	@cp $(BUILD)/etc/default.properties $(INSTALLPREFIX)/etc
+	@cp $(BUILD)/etc/*.conf $(INSTALLPREFIX)/etc
+	@echo "  copying scripts to $(INSTALLPREFIX)"
+	@cp $(BUILD)/run.sh $(INSTALLPREFIX)
+	@cp $(BUILD)/run.bat $(INSTALLPREFIX)
+	@echo "  copying documention to $(INSTALLPREFIX)/doc"
+	@cp -R $(BUILD)/doc $(INSTALLPREFIX)
+	@echo "  copying text information files to $(INSTALLPREFIX)"
+	@cp $(BUILD)/COPYING $(CHANGELOG) $(INSTALLPREFIX)
+	@echo "Completed install to $(INSTALLPREFIX)"
 	@echo "-------------------------------------------------------"
 
 ### Other
 
-run : build
+.PHONY : run
+run : $(MCOMPILECHECK)
 	cd $(BUILD) && ./run.sh
 
 ### Global Include