--- projects/cms/source/server/build/Makefile	2003/02/01 19:08:54	1.12
+++ projects/cms/source/server/build/Makefile	2003/02/21 13:45:48	1.17
@@ -1,5 +1,5 @@
 # Makefile for build
-# $Id: Makefile,v 1.12 2003/02/01 19:08:54 tdb Exp $
+# $Id: Makefile,v 1.17 2003/02/21 13:45:48 tdb Exp $
 
 include ../Config.inc
 
@@ -12,14 +12,15 @@ all : dist
 clean :
 	rm -Rf $(BUILDFILES)
 	rm -f $(PACKAGE)
-	rm -f $(UTILPACKAGE)
 	rm -f $(CHANGELOG)
+	rm -f $(LICFILE)
 	rm -Rf $(DISTDIR)
-	rm -f $(TARFILE)
-	rm -f $(TARGZFILE)
-	rm -f $(ZIPFILE)
+	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)
+	rm -f $(MKDISTBINCHECK) $(MKDISTCHECK) $(MKDISTFILESCHECK) $(MKDISTFILESBINCHECK)
 
 .PHONY : package
 package : $(PACKAGE)
@@ -28,17 +29,11 @@ $(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
 
-.PHONY : packageutil
-packageutil : $(UTILPACKAGE)
-
-$(UTILPACKAGE) : $(MCOMPILECHECK)
-	jar -cf $(UTILPACKAGE) $(BUILDFILES)
-
 .PHONY : dist-bin
-dist-bin : $(MKDISTBINCHECK) $(MKDISTFILESCHECK)
+dist-bin : $(MKDISTBINCHECK) $(MKDISTFILESBINCHECK)
 
 .PHONY : dist
 dist : $(MKDISTCHECK) $(MKDISTFILESCHECK)
@@ -49,7 +44,7 @@ $(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 README run.sh run.bat COPYING | ( cd $(DISTDIR) && tar -xf - )
+	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)
@@ -71,7 +66,20 @@ $(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)