diff options
| author | Max Horn | 2003-09-07 03:21:30 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-07 03:21:30 +0000 |
| commit | 116af3c30c95460f1f6945adb5946d44f4772f71 (patch) | |
| tree | 3587364c27f19c1563d75c0cea49c30b3eaa19b5 | |
| parent | 78476c6bd68834fa0a283c1c4b5ecbb140a94472 (diff) | |
| download | scummvm-rg350-116af3c30c95460f1f6945adb5946d44f4772f71.tar.gz scummvm-rg350-116af3c30c95460f1f6945adb5946d44f4772f71.tar.bz2 scummvm-rg350-116af3c30c95460f1f6945adb5946d44f4772f71.zip | |
cleanup
svn-id: r10059
| -rw-r--r-- | common.rules | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/common.rules b/common.rules index 19c5307bdc..97e7507d99 100644 --- a/common.rules +++ b/common.rules @@ -1,25 +1,27 @@ # 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)/lib$(MODULE).a +MODULE_LIB-$(MODULE) := $(MODULE)/$(PLUGIN_PREFIX)$(MODULE)$(PLUGIN_SUFFIX) 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_OBJS) +$(MODULE): $(MODULE_LIB-$(MODULE)) -# Add convenience library to main OBJS list -OBJS += $(MODULE)/lib$(MODULE).a +ifdef STATIC_PLUGINS +# Add static plugin object files to the main OBJS list +OBJS += $(MODULE_LIB-$(MODULE)) +endif .PHONY: clean-$(MODULE) $(MODULE) |