[Scummvm-cvs-logs] CVS: scummvm common.rules,1.4,1.5
Travis Howell
kirben at users.sourceforge.net
Sun Sep 7 00:25:04 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm module.mk,1.21,1.22 scumm.h,1.293,1.294 scummvm.cpp,2.374,2.375 sound.cpp,1.234,1.235
- Next message: [Scummvm-cvs-logs] CVS: web compatibility.php,1.241,1.242
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory sc8-pr-cvs1:/tmp/cvs-serv13001
Modified Files:
common.rules
Log Message:
Index: common.rules
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common.rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common.rules 7 Sep 2003 03:21:30 -0000 1.4
+++ common.rules 7 Sep 2003 07:24:51 -0000 1.5
@@ -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)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm module.mk,1.21,1.22 scumm.h,1.293,1.294 scummvm.cpp,2.374,2.375 sound.cpp,1.234,1.235
- Next message: [Scummvm-cvs-logs] CVS: web compatibility.php,1.241,1.242
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list