cleanup of Makefile for building distribution packages

[rocksndiamonds.git] / Makefile

diff --git a/Makefile b/Makefile
index ea1154ef1c2ea54566dc97b86ab836b3fda47884..41840b0cb6e2734dd816b2dd57051631069f5bfa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,12 @@
 # =============================================================================
-# Rocks'n'Diamonds Makefile
+# Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
-# (c) 1995-2007 Holger Schemel <info@artsoft.org>
+# (c) 1995-2015 by Artsoft Entertainment
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
+# -----------------------------------------------------------------------------
+# Makefile
 # =============================================================================
 
 # -----------------------------------------------------------------------------
@@ -16,16 +21,17 @@ CC = gcc
 # (this must be set to "gmake" for some systems)
 MAKE = make
 
-# path to X11 on your system
-X11_PATH = /usr/X11R6
-
 # directory for read-only game data (like graphics, sounds, levels)
 # default is '.' to be able to run program without installation
 # RO_GAME_DIR = /usr/games
+# use the following setting for Debian / Ubuntu installations:
+# RO_GAME_DIR = /usr/share/games/rocksndiamonds
 
 # directory for writable game data (like highscore files)
 # default is '.' to be able to run program without installation
 # RW_GAME_DIR = /var/games
+# use the following setting for Debian / Ubuntu installations:
+# RW_GAME_DIR = /var/games/rocksndiamonds
 
 # uncomment if system has no joystick include file
 # JOYSTICK = -DNO_JOYSTICK
@@ -37,13 +43,9 @@ X11_PATH = /usr/X11R6
 # uncomment to install game in single-user environment (default)
 # SCORE_ENTRIES = MANY_PER_NAME
 
-# paths for cross-compiling (only needed for non-native MS-DOS and Win32 build)
-CROSS_PATH_MSDOS = /usr/local/cross-msdos/i386-msdosdjgpp
+# path for cross-compiling (only needed for non-native Windows build)
 CROSS_PATH_WIN32 = /usr/local/cross-tools/i386-mingw32msvc
 
-# compile special edition of R'n'D instead of the normal (classic) version
-SPECIAL_EDITION = rnd_jue
-
 
 # -----------------------------------------------------------------------------
 # there should be no need to change anything below
@@ -54,50 +56,32 @@ SPECIAL_EDITION = rnd_jue
 SRC_DIR = src
 MAKE_CMD = $(MAKE) -C $(SRC_DIR)
 
-# DEFAULT_TARGET = x11
-DEFAULT_TARGET = sdl
-
 
 # -----------------------------------------------------------------------------
 # build targets
 # -----------------------------------------------------------------------------
 
 all:
-       @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET)
-
-x11:
-       @$(MAKE_CMD) TARGET=x11
+       @$(MAKE_CMD)
 
 sdl:
        @$(MAKE_CMD) TARGET=sdl
 
-solaris:
-       @$(MAKE_CMD) PLATFORM=solaris TARGET=x11
-
-solaris-sdl:
-       @$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
+sdl2:
+       @$(MAKE_CMD) TARGET=sdl2
 
 mac:
        @$(MAKE_CMD) PLATFORM=macosx
 
-mac-static:
-       @$(MAKE_CMD) PLATFORM=macosx TARGET=sdl-static
-
-msdos:
-       @$(MAKE_CMD) PLATFORM=msdos
-
-os2:
-       @$(MAKE_CMD) PLATFORM=os2
-
-cross-msdos:
-       @PATH=$(CROSS_PATH_MSDOS)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-msdos
-
 cross-win32:
        @PATH=$(CROSS_PATH_WIN32)/bin:${PATH} $(MAKE_CMD) PLATFORM=cross-win32
 
 clean:
        @$(MAKE_CMD) clean
 
+clean-git:
+       @$(MAKE_CMD) clean-git
+
 
 # -----------------------------------------------------------------------------
 # development, test, distribution build and packaging targets
@@ -130,82 +114,50 @@ enginetestnew: all
 leveltest: all
        ./Scripts/make_enginetest.sh leveltest
 
-backup:
-       ./Scripts/make_backup.sh src 1
-
-backup2:
-       ./Scripts/make_backup.sh src 2
-
-backup3:
-       ./Scripts/make_backup.sh src 3
-
-backup_lev:
-       ./Scripts/make_backup.sh lev
-
-backup_gfx:
-       ./Scripts/make_backup.sh gfx
-
-# prerelease:
-#      ./Scripts/make_prerelease.sh
+levelsketch_images: all
+       ./Scripts/make_levelsketch_images.sh
 
 dist-clean:
        @$(MAKE_CMD) dist-clean
 
 dist-build-unix:
-       @BUILD_DIST=TRUE $(MAKE) x11
-
-dist-build-msdos:
-       @BUILD_DIST=TRUE $(MAKE) cross-msdos
+       @BUILD_DIST=TRUE $(MAKE)
 
 dist-build-win32:
        @BUILD_DIST=TRUE $(MAKE) cross-win32
 
 dist-build-macosx:
-       # (this is done by "dist-package-macosx" target)
+       @BUILD_DIST=TRUE $(MAKE)
 
 dist-package-unix:
-       ./Scripts/make_dist.sh unix .
-
-dist-package-msdos:
-       ./Scripts/make_dist.sh dos .
+       ./Scripts/make_dist.sh package unix
 
 dist-package-win32:
-       ./Scripts/make_dist.sh win .
+       ./Scripts/make_dist.sh package win
 
 dist-package-macosx:
-       ./Scripts/make_dist.sh mac . $(MAKE)
+       ./Scripts/make_dist.sh package mac
 
 dist-upload-unix:
-       ./Scripts/make_dist.sh unix . upload
-
-dist-upload-msdos:
-       ./Scripts/make_dist.sh dos . upload
+       ./Scripts/make_dist.sh upload unix
 
 dist-upload-win32:
-       ./Scripts/make_dist.sh win . upload
+       ./Scripts/make_dist.sh upload win
 
 dist-upload-macosx:
-       ./Scripts/make_dist.sh mac . upload
-
-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
+       ./Scripts/make_dist.sh upload mac
 
 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
+package-all: dist-package-all
 
 upload-all: dist-upload-all