From 1c7d05c93f4b6a6acfd66148c3ae5d4c5b0b7491 Mon Sep 17 00:00:00 2001
From: Travis Howell <kirben@scummvm.org>
Date: Sun, 7 Sep 2003 07:24:51 +0000
Subject: [PATCH] *** empty log message ***

svn-id: r10062
---
 common.rules | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/common.rules b/common.rules
index 97e7507d998..19c5307bdc5 100644
--- a/common.rules
+++ b/common.rules
@@ -1,27 +1,25 @@
 # Common build rules, used by the sub modules and their module.mk files
 
+# Convenience library target
+$(MODULE)/lib$(MODULE).a: $(MODULE_OBJS)
+	-$(RM) $@
+	$(AR) $@ $+
+	$(RANLIB) $@ 
+
 # Clean target, removes all object files. This looks a bit hackish, as we have to
 # copy the content of MODULE_OBJS to another unique variable (the next module.mk
 # will overwrite it after all). The same for the libMODULE.a library file.
 MODULE_OBJS-$(MODULE) := $(MODULE_OBJS)
-MODULE_LIB-$(MODULE) := $(MODULE)/$(PLUGIN_PREFIX)$(MODULE)$(PLUGIN_SUFFIX)
+MODULE_LIB-$(MODULE) := $(MODULE)/lib$(MODULE).a
 clean: clean-$(MODULE)
 clean-$(MODULE): clean-% :
 	-$(RM) $(MODULE_OBJS-$*) $(MODULE_LIB-$*)
 
-# Convenience library target
-$(MODULE_LIB-$(MODULE)): $(MODULE_OBJS)
-	-$(RM) $@
-	$(AR) $@ $+
-	$(RANLIB) $@ 
-
 
 # Pseudo target for comfort, allows for "make common", "make gui" etc.
-$(MODULE): $(MODULE_LIB-$(MODULE))
+$(MODULE): $(MODULE_OBJS)
 
-ifdef STATIC_PLUGINS
-# Add static plugin object files to the main OBJS list
-OBJS += $(MODULE_LIB-$(MODULE))
-endif
+# Add convenience library to main OBJS list
+OBJS += $(MODULE)/lib$(MODULE).a
 
 .PHONY: clean-$(MODULE) $(MODULE)