X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=Makefile;h=c157ab6468e7e118c368e0f220559696df01f26c;hb=f926e522aef77158e0011ae5ad2cf8805509d6d1;hp=a2ceff1dcece4a670382bc03b409963e001423e9;hpb=852a8eef1e8858a40da0be4093eba3deaf468f51;p=rocksndiamonds.git

diff --git a/Makefile b/Makefile
index a2ceff1d..c157ab64 100644
--- a/Makefile
+++ b/Makefile
@@ -100,20 +100,20 @@ clean:
 
 
 # -----------------------------------------------------------------------------
-# development only
+# development, test, distribution build and packaging targets
 # -----------------------------------------------------------------------------
 
 auto-conf:
 	@$(MAKE_CMD) auto-conf
 
 run: all
-	@./rocksndiamonds --verbose
+	@$(MAKE_CMD) run
 
 gdb: all
-	@gdb -batch -x GDB_COMMANDS ./rocksndiamonds
+	@$(MAKE_CMD) gdb
 
 valgrind: all
-	@valgrind -v --leak-check=yes ./rocksndiamonds 2> valgrind.out
+	@$(MAKE_CMD) valgrind
 
 enginetest: all
 	./Scripts/make_enginetest.sh
@@ -130,14 +130,16 @@ enginetestnew: all
 leveltest: all
 	./Scripts/make_enginetest.sh leveltest
 
+levelsketch_images: all
+	./Scripts/make_levelsketch_images.sh
+
 backup:
-	./Scripts/make_backup.sh src 1
+	./Scripts/make_backup.sh src tar
 
-backup2:
-	./Scripts/make_backup.sh src 2
+backup-net-copy:
+	./Scripts/make_backup.sh src scp
 
-backup3:
-	./Scripts/make_backup.sh src 3
+backup-net: backup backup-net-copy
 
 backup_lev:
 	./Scripts/make_backup.sh lev
@@ -148,53 +150,70 @@ backup_gfx:
 # prerelease:
 #	./Scripts/make_prerelease.sh
 
-dist-unix:
+jue:
+	sed -e 's/# SPECIAL_EDITION/SPECIAL_EDITION/' Makefile > Makefile.jue
+	$(MAKE) -f Makefile.jue cross-win32
+
+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