diff options
| author | Max Horn | 2003-09-08 15:34:50 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-08 15:34:50 +0000 |
| commit | ea0fcaaea0287e05cbcb883f83153b15c7ee68e8 (patch) | |
| tree | 5bf5ecfe71eb2ee0cd19b5d30f730015c1b25c2f | |
| parent | c3491bbfab881c8f2e2680031580635ba98daddf (diff) | |
| download | scummvm-rg350-ea0fcaaea0287e05cbcb883f83153b15c7ee68e8.tar.gz scummvm-rg350-ea0fcaaea0287e05cbcb883f83153b15c7ee68e8.tar.bz2 scummvm-rg350-ea0fcaaea0287e05cbcb883f83153b15c7ee68e8.zip | |
put back my previous changes which Kirben reverted (correctly: I had forgotten to commit the updated Makefile.common)
svn-id: r10091
| -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) |