--- projects/cms/source/server/Makefile 2003/02/05 22:15:32 1.31 +++ projects/cms/source/server/Makefile 2003/02/16 20:35:59 1.35 @@ -1,5 +1,5 @@ # Makefile for server -# $Id: Makefile,v 1.31 2003/02/05 22:15:32 tdb Exp $ +# $Id: Makefile,v 1.35 2003/02/16 20:35:59 tdb Exp $ include Config.inc @@ -11,6 +11,7 @@ all : dist .PHONY : build build : $(IDLCHECK) cd uk/org/iscream/cms/server && $(MAKE) all + cp $(SOURCEROOT)/$(LICFILE) $(BUILD) cd $(BUILD) && $(MAKE) package ### Source, Doc, & Changelog @@ -38,7 +39,7 @@ mkjavadoc : $(IDLCHECK) 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) @@ -79,13 +80,6 @@ distclean : clean rm -Rf $(APICACHE) rm -f Config.inc -### Util Package - -.PHONY : buildutil -buildutil : clean - cd uk/org/iscream/cms/server/util && $(MAKE) all - cd $(BUILD) && $(MAKE) packageutil - ### Database .PHONY : createtable @@ -117,7 +111,7 @@ install : $(MCOMPILECHECK) $(JAVADOCCHECK) $(CHANGELOG @cp $(BUILD)/run.bat $(INSTALLPREFIX) @echo " copying documention to $(INSTALLPREFIX)/doc" @cp -R $(BUILD)/doc $(INSTALLPREFIX) - @echo " copying text information files to $(INSTALLPREFIX" + @echo " copying text information files to $(INSTALLPREFIX)" @cp $(BUILD)/COPYING $(CHANGELOG) $(INSTALLPREFIX) @echo "Completed install to $(INSTALLPREFIX)" @echo "-------------------------------------------------------"