X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=ea1154ef1c2ea54566dc97b86ab836b3fda47884;hb=0448c027347ae76facf5475a21884ca2476f035f;hp=8fb5f1d9b91725e60d5f596881bafb5ce99a2a72;hpb=9f907eef20bc6b488473d29310d2384eee3619da;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index 8fb5f1d9..ea1154ef 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ clean:
 
 
 # -----------------------------------------------------------------------------
-# development only
+# development, test, distribution build and packaging targets
 # -----------------------------------------------------------------------------
 
 auto-conf:
@@ -148,53 +148,66 @@ backup_gfx:
 # prerelease:
 #	./Scripts/make_prerelease.sh
 
-dist-unix:
+dist-clean:
+	@$(MAKE_CMD) dist-clean
+
+dist-build-unix:
+	@BUILD_DIST=TRUE $(MAKE) x11
+
+dist-build-msdos:
+	@BUILD_DIST=TRUE $(MAKE) cross-msdos
+
+dist-build-win32:
+	@BUILD_DIST=TRUE $(MAKE) cross-win32
+
+dist-build-macosx:
+	# (this is done by "dist-package-macosx" target)
+
+dist-package-unix:
 	./Scripts/make_dist.sh unix .
 
-dist-msdos:
+dist-package-msdos:
 	./Scripts/make_dist.sh dos .
 
-dist-win32:
+dist-package-win32:
 	./Scripts/make_dist.sh win .
 
-dist-macosx:
+dist-package-macosx:
 	./Scripts/make_dist.sh mac . $(MAKE)
 
-upload-unix:
+dist-upload-unix:
 	./Scripts/make_dist.sh unix . upload
 
-upload-msdos:
+dist-upload-msdos:
 	./Scripts/make_dist.sh dos . upload
 
-upload-win32:
+dist-upload-win32:
 	./Scripts/make_dist.sh win . upload
 
-upload-macosx:
+dist-upload-macosx:
 	./Scripts/make_dist.sh mac . upload
 
-dist-clean:
-	@$(MAKE_CMD) dist-clean
-
-dist-build-unix:
-	@BUILD_DIST=TRUE $(MAKE) x11
-
-dist-build-win32:
-	@BUILD_DIST=TRUE $(MAKE) cross-win32
-
-dist-build-msdos:
-	@BUILD_DIST=TRUE $(MAKE) cross-msdos
-
 dist-build-all:
 	$(MAKE) clean
 	$(MAKE) dist-build-unix		; $(MAKE) dist-clean
 	$(MAKE) dist-build-win32	; $(MAKE) dist-clean
 #	$(MAKE) dist-build-msdos	; $(MAKE) dist-clean
 
-# dist-all: dist-build-all dist-unix dist-msdos dist-win32 dist-macosx
-dist-all: dist-build-all dist-unix dist-win32 dist-macosx
+dist-package-all:
+	$(MAKE) dist-package-unix
+	$(MAKE) dist-package-win32
+	$(MAKE) dist-package-macosx
+#	$(MAKE) dist-package-msdos
+
+dist-upload-all:
+	$(MAKE) dist-upload-unix
+	$(MAKE) dist-upload-win32
+	$(MAKE) dist-upload-macosx
+#	$(MAKE) dist-upload-msdos
+
+dist-all: dist-build-all dist-package-all
 
-# upload-all: upload-unix upload-msdos upload-win32 upload-macosx
-upload-all: upload-unix upload-win32 upload-macosx
+upload-all: dist-upload-all
 
 tags:
 	$(MAKE_CMD) tags