[Scummvm-cvs-logs] CVS: scummvm Makefile,1.81,1.82 Makefile.common,1.90,1.91 common.rules,1.15,1.16

[Marcus Comstedt]

Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10031

Modified Files:
	Makefile Makefile.common common.rules 
Log Message:
PLUGIN_PREFIX and PLUGIN_SUFFIX moved to Makefile, PLUGIN_EXTRA_DEPS added.

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- Makefile	27 Jul 2004 12:16:03 -0000	1.81
+++ Makefile	22 Aug 2004 21:39:48 -0000	1.82
@@ -29,6 +29,18 @@
 CXXFLAGS+= -Wshadow -Wimplicit -Wundef -Wnon-virtual-dtor
 CXXFLAGS+= -Wno-reorder -Wwrite-strings -fcheck-new -Wctor-dtor-privacy 
 
+######################################################################
+# Plugin settings
+######################################################################
+
+# Plugin prefix. Typically "lib" on Unix, and nothing everywhere else
+PLUGIN_PREFIX := lib
+# Plugin suffix. For static/shared libs this is typically ".so"/".a" on Unix,
+# ".dll"/".lib" on Windows, ".bundle"/".a" on OS X, etc.
+PLUGIN_SUFFIX := .so
+
+PLUGIN_EXTRA_DEPS := $(EXECUTABLE)
+
 #######################################################################
 # Misc stuff - you should never have to edit this                     #
 #######################################################################

Index: Makefile.common
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.common,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- Makefile.common	21 May 2004 02:08:46 -0000	1.90
+++ Makefile.common	22 Aug 2004 21:39:49 -0000	1.91
@@ -28,16 +28,6 @@
 
 
 ######################################################################
-# Plugin settings
-######################################################################
-
-# Plugin prefix. Typically "lib" on Unix, and nothing everywhere else
-PLUGIN_PREFIX := lib
-# Plugin suffix. For static/shared libs this is typically ".so"/".a" on Unix,
-# ".dll"/".lib" on Windows, ".bundle"/".a" on OS X, etc.
-PLUGIN_SUFFIX := .so
-
-######################################################################
 # Module settings
 ######################################################################
 

Index: common.rules
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common.rules,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- common.rules	6 May 2004 09:58:48 -0000	1.15
+++ common.rules	22 Aug 2004 21:39:49 -0000	1.16
@@ -11,8 +11,8 @@
 # via the configure script, or put in some 'if' statements to choose from
 # one of several build rules
 PLUGIN-$(MODULE) := $(MODULE)/$(PLUGIN_PREFIX)$(MODULE)$(PLUGIN_SUFFIX)
-$(PLUGIN-$(MODULE)): $(MODULE_OBJS) $(EXECUTABLE)
-	$(CXX) $(PLUGIN_LDFLAGS) $(filter-out $(EXECUTABLE),$+) -o $@
+$(PLUGIN-$(MODULE)): $(MODULE_OBJS) $(PLUGIN_EXTRA_DEPS)
+	$(CXX) $(PLUGIN_LDFLAGS) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) -o $@
 PLUGIN:=
 plugins: $(PLUGIN-$(MODULE))