--- projects/cms/source/server/build/Makefile	2001/01/18 23:47:47	1.6
+++ projects/cms/source/server/build/Makefile	2003/02/21 13:45:48	1.17
@@ -1,38 +1,85 @@
 # Makefile for build
-# $Id: Makefile,v 1.6 2001/01/18 23:47:47 tdb Exp $
+# $Id: Makefile,v 1.17 2003/02/21 13:45:48 tdb Exp $
 
 include ../Config.inc
 
 BUILDFILES = uk
 
-all : package
+.PHONY : all
+all : dist
 
+.PHONY : clean
 clean :
 	rm -Rf $(BUILDFILES)
-	rm -Rf $(PACKAGE)
-	rm -Rf $(UTILPACKAGE)
-	rm -Rf $(ARCNAME)*$(TAREXT)
-	rm -Rf $(ARCNAME)*$(TARGZEXT)
-	rm -Rf $(ARCNAME)*$(ZIPEXT)
+	rm -f $(PACKAGE)
+	rm -f $(CHANGELOG)
+	rm -f $(LICFILE)
+	rm -Rf $(DISTDIR)
+	rm -f $(TARFILE) $(TARGZFILE) $(ZIPFILE)
+	rm -f $(TARGZFILESIG) $(ZIPFILESIG)
+	rm -f $(BINTARFILE) $(BINTARGZFILE) $(BINZIPFILE)
+	rm -f $(BINTARGZFILESIG) $(BINZIPFILESIG)
+	rm -Rf $(DOCDIR) $(SRCDIR)
+	rm -f $(MKDISTBINCHECK) $(MKDISTCHECK) $(MKDISTFILESCHECK) $(MKDISTFILESBINCHECK)
 
-package : $(PACKAGE) maketar makezip
+.PHONY : package
+package : $(PACKAGE)
 
-$(PACKAGE) : $(BUILDCHECK)
+$(PACKAGE) : $(IDLCHECK) $(MCOMPILECHECK)
+	rm -f $(PACKAGE)
 	@echo "Main-Class: $(MAINCLASS)" > MANIFEST_TMP
 	@echo "Class-Path: $(CLPATH)" >> MANIFEST_TMP
-	jar -cmf MANIFEST_TMP $(PACKAGE) $(BUILDFILES)
+	jar -cmf MANIFEST_TMP $(PACKAGE) $(BUILDFILES) $(JACPROP)
 	rm -f MANIFEST_TMP
 
-packageutil : $(UTILPACKAGE)
+.PHONY : dist-bin
+dist-bin : $(MKDISTBINCHECK) $(MKDISTFILESBINCHECK)
 
-$(UTILPACKAGE) : $(BUILDCHECK)
-	jar -cf $(UTILPACKAGE) $(BUILDFILES)
+.PHONY : dist
+dist : $(MKDISTCHECK) $(MKDISTFILESCHECK)
 
-maketar :
-	tar -cvf $(TARFILE) $(PACKAGE) `ls -d lib/* | grep -v CVS` `ls -d etc/* | grep -v CVS` README run.sh
-	gzip -fv9 $(TARFILE)
+.PHONY : mk-dist-bin
+mk-dist-bin : $(MKDISTBINCHECK)
+$(MKDISTBINCHECK) : $(PACKAGE) $(CHANGELOG)
+	if test ! -d "$(DISTDIR)"; then mkdir -p $(DISTDIR); fi
+	echo "CVS" > TAR_EXCLUDE_TMP
+	echo ".#*" >> TAR_EXCLUDE_TMP
+	tar -cf - -X TAR_EXCLUDE_TMP $(PACKAGE) lib etc ChangeLog README run.sh run.bat COPYING | ( cd $(DISTDIR) && tar -xf - )
+	rm -f TAR_EXCLUDE_TMP
+	@touch $(MKDISTBINCHECK)
+	@rm -f $(MKDISTFILESCHECK)
 
-makezip :
-	zip -9 $(ZIPFILE) $(PACKAGE) `ls -d lib/* | grep -v CVS` `ls -d etc/* | grep -v CVS` README run.bat
+.PHONY : mk-dist
+mk-dist : $(MKDISTCHECK)
+$(MKDISTCHECK) : $(PACKAGE) $(JAVADOCCHECK) $(SRCCHECK) $(CHANGELOG)
+	if test ! -d "$(DISTDIR)"; then mkdir -p $(DISTDIR); fi
+	echo "CVS" > TAR_EXCLUDE_TMP
+	echo ".#*" >> TAR_EXCLUDE_TMP
+	tar -cf - -X TAR_EXCLUDE_TMP $(PACKAGE) lib etc src ChangeLog doc README run.sh run.bat COPYING | ( cd $(DISTDIR) && tar -xf - )
+	rm -f TAR_EXCLUDE_TMP
+	@touch $(MKDISTCHECK)
+	@rm -f $(MKDISTFILESCHECK)
+
+.PHONY : mk-distfiles
+mk-distfiles : $(MKDISTFILESCHECK)
+$(MKDISTFILESCHECK) :
+	if test ! -d "$(DISTDEST)"; then mkdir -p $(DISTDEST); fi
+	tar -cvf $(DISTDEST)/$(TARFILE) $(DISTDIR)
+	gzip -fv9 $(DISTDEST)/$(TARFILE)
+	-$(GPG) $(GPGFLAGS) $(DISTDEST)/$(TARGZFILE)
+	zip -r -9 $(DISTDEST)/$(ZIPFILE) $(DISTDIR)/*
+	-$(GPG) $(GPGFLAGS) $(DISTDEST)/$(ZIPFILE)
+	@touch $(MKDISTFILESCHECK)
+
+.PHONY : mk-distfiles-bin
+mk-distfiles-bin : $(MKDISTFILESBINCHECK)
+$(MKDISTFILESBINCHECK) :
+	if test ! -d "$(DISTDEST)"; then mkdir -p $(DISTDEST); fi
+	tar -cvf $(DISTDEST)/$(BINTARFILE) $(DISTDIR)
+	gzip -fv9 $(DISTDEST)/$(BINTARFILE)
+	-$(GPG) $(GPGFLAGS) $(DISTDEST)/$(BINTARGZFILE)
+	zip -r -9 $(DISTDEST)/$(BINZIPFILE) $(DISTDIR)/*
+	-$(GPG) $(GPGFLAGS) $(DISTDEST)/$(BINZIPFILE)
+	@touch $(MKDISTFILESBINCHECK)
 
 include $(MKINC)