From 38f200fc55fc8a05c848feeec52e5c28224311ba Mon Sep 17 00:00:00 2001
From: Jordi Vilalta Prat
Date: Tue, 6 May 2008 03:11:01 +0000
Subject: Unified BUILD_PLUGINS and DYNAMIC_MODULES in the makefiles

svn-id: r31889
---
 backends/platform/dc/Makefile      |  4 ++--
 backends/platform/dc/README        |  2 +-
 backends/platform/ds/arm9/makefile |  4 ++--
 backends/platform/wince/Makefile   |  8 ++++----
 configure                          | 22 +++++++++++-----------
 ports.mk                           |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile
index db56035b7b..0a048c45e9 100644
--- a/backends/platform/dc/Makefile
+++ b/backends/platform/dc/Makefile
@@ -3,7 +3,7 @@
 
 ronindir = /usr/local/ronin
 
-BUILD_PLUGINS = 1
+DYNAMIC_MODULES = 1
 
 srcdir = ../../..
 VPATH = $(srcdir)
@@ -28,7 +28,7 @@ RANLIB = sh-elf-ranlib
 HAVE_GCC3 = true
 DISABLE_SCALERS = true
 
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
 DEFINES += -DDYNAMIC_MODULES
 PRE_OBJS_FLAGS = -Wl,--whole-archive
 POST_OBJS_FLAGS = -Wl,--no-whole-archive
diff --git a/backends/platform/dc/README b/backends/platform/dc/README
index 56579b74db..e4ebda840e 100644
--- a/backends/platform/dc/README
+++ b/backends/platform/dc/README
@@ -21,6 +21,6 @@ Edit the Makefile to contain the path to libronin if you installed it
 somewhere other than /usr/local/ronin, then run `make dist', and you
 should get a scrambled binary SCUMMVM.BIN and some plugins *.PLG.
 
-For serial/IP upload, remove the "BUILD_PLUGINS" line and just run `make',
+For serial/IP upload, remove the "DYNAMIC_MODULES" line and just run `make',
 to get a static binary with the name `scummvm.elf'.
 
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index b114c79b48..ea98402d4e 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -1,4 +1,4 @@
-#BUILD_PLUGINS = 1
+#DYNAMIC_MODULES = 1
 #libndsdir = $(DEVKITPRO)/libnds
 libndsdir = /home/neil/devkitpror21/libnds
 
@@ -211,7 +211,7 @@ AS = arm-eabi-as
 HAVE_GCC3 = true
 DISABLE_SCALERS = true
 
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
 DEFINES += -DDYNAMIC_MODULES
 PRE_OBJS_FLAGS = -Wl,--whole-archive
 POST_OBJS_FLAGS = -Wl,--no-whole-archive
diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile
index a99d9a6bde..734bf82eaa 100644
--- a/backends/platform/wince/Makefile
+++ b/backends/platform/wince/Makefile
@@ -12,7 +12,7 @@
 ########################################################################
 ## Do you want a build using plugins?
 
-#BUILD_PLUGINS = 1
+#DYNAMIC_MODULES = 1
 # TODO: You'll need to change STATIC_PLUGIN to DYNAMIC_PLUGIN below
 
 ########################################################################
@@ -175,11 +175,11 @@ OBJS += $(srcdir)/gui/Actions.o $(srcdir)/gui/Key.o $(srcdir)/gui/KeysDialog.o
 OBJS += ../sdl/sdl.o ../sdl/graphics.o ../sdl/events.o
 OBJS += missing/missing.o
 OBJS += ARMscaler.o
-ifndef BUILD_PLUGINS
+ifndef DYNAMIC_MODULES
 OBJS += PocketSCUMM.o
 endif
 
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
 EXECUTABLE		 = scummvm.dll
 PLUGIN_PREFIX		:=
 PLUGIN_SUFFIX		:= .dll
@@ -195,7 +195,7 @@ include $(srcdir)/Makefile.common
 ########################################################################
 ## Our top level target, and what we deploy depends on whether we are
 ## building the plugin version or not...
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
 
 all: dist-plugins
 
diff --git a/configure b/configure
index 4e6101a2b0..29d8aed8c8 100755
--- a/configure
+++ b/configure
@@ -105,7 +105,7 @@ add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes
 _endian=unknown
 _need_memalign=no
 _have_x86=no
-_build_plugins=no
+_dynamic_modules=no
 _plugins_default=static
 _nasm=auto
 
@@ -654,7 +654,7 @@ for ac_option in $@; do
 	--disable-nasm)           _nasm=no        ;;
 	--disable-mpeg2)          _mpeg2=no       ;;
 	--disable-fluidsynth)     _fluidsynth=no  ;;
-	--enable-plugins)         _build_plugins=yes ;;
+	--enable-plugins)         _dynamic_modules=yes ;;
 	--default-dynamic)        _plugins_default=dynamic ;;
 	--enable-mt32emu)         _mt32emu=yes    ;;
 	--disable-mt32emu)        _mt32emu=no     ;;
@@ -1217,11 +1217,11 @@ add_to_config_h_if_yes $_need_memalign '#define SCUMM_NEED_ALIGNMENT'
 # Check whether plugin support is requested and possible
 #
 echo_n "Checking whether building plugins was requested... "
-echo "$_build_plugins"
+echo "$_dynamic_modules"
 _mak_plugins=
 _def_plugin="/* -> plugins disabled */"
 
-if test "$_build_plugins" = yes ; then
+if test "$_dynamic_modules" = yes ; then
 	echo_n "Checking whether building plugins is supported... "
 	case $_host_os in
 	linux*)
@@ -1230,7 +1230,7 @@ _def_plugin='
 #define PLUGIN_SUFFIX	".so"
 '
 _mak_plugins='
-BUILD_PLUGINS := 1
+DYNAMIC_MODULES := 1
 PLUGIN_PREFIX := lib
 PLUGIN_SUFFIX := .so
 PLUGIN_EXTRA_DEPS =
@@ -1248,7 +1248,7 @@ _def_plugin='
 #define PLUGIN_SUFFIX	".so"
 '
 _mak_plugins='
-BUILD_PLUGINS := 1
+DYNAMIC_MODULES := 1
 PLUGIN_PREFIX := lib
 PLUGIN_SUFFIX := .so
 PLUGIN_EXTRA_DEPS =
@@ -1265,7 +1265,7 @@ _def_plugin='
 #define PLUGIN_SUFFIX	".plugin"
 '
 _mak_plugins='
-BUILD_PLUGINS := 1
+DYNAMIC_MODULES := 1
 PLUGIN_PREFIX :=
 PLUGIN_SUFFIX := .plugin
 PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
@@ -1282,7 +1282,7 @@ _def_plugin='
 #define PLUGIN_SUFFIX	".dll"
 '
 _mak_plugins='
-BUILD_PLUGINS		:= 1
+DYNAMIC_MODULES		:= 1
 PLUGIN_PREFIX		:=
 PLUGIN_SUFFIX		:= .dll
 PLUGIN_EXTRA_DEPS	= $(EXECUTABLE)
@@ -1293,12 +1293,12 @@ POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-im
 '
 		;;
 	*)
-		_build_plugins=no
+		_dynamic_modules=no
 		_mak_plugins=
 		_def_plugin=
 		;;
 	esac
-	echo "$_build_plugins"
+	echo "$_dynamic_modules"
 fi
 
 
@@ -1566,7 +1566,7 @@ for engine in $_engines; do
 		else
 			# If dynamic plugins aren't supported, mark
 			# all the engines as static
-			if test $_build_plugins = no ; then
+			if test $_dynamic_modules = no ; then
 				eval _engine_${engine}_build=static
 			else
 				# If it wasn't explicitly marked as static or
diff --git a/ports.mk b/ports.mk
index 3e8095367b..3d79384e19 100644
--- a/ports.mk
+++ b/ports.mk
@@ -19,7 +19,7 @@ install: all
 	$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/COPYRIGHT" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
 	$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
 	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/"
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
 	$(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/"
 	$(INSTALL) -c -s -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
 endif
@@ -30,7 +30,7 @@ uninstall:
 	rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
 	rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
 	rm -rf "$(DESTDIR)$(DATADIR)/scummvm/"
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
 	rm -rf "$(DESTDIR)$(LIBDIR)/scummvm/"
 endif
 
-- 
cgit v1.2.3