diff options
| author | Marcus Comstedt | 2004-08-22 21:39:49 +0000 |
|---|---|---|
| committer | Marcus Comstedt | 2004-08-22 21:39:49 +0000 |
| commit | c8d0270510ea09c9080759e1cbd353ba07391ac6 (patch) | |
| tree | 3d1dc69d230eb09c030eeacc711a511445a89356 | |
| parent | bfd0b427000b651e2964ffbe04eb9bce4f06dae4 (diff) | |
| download | scummvm-rg350-c8d0270510ea09c9080759e1cbd353ba07391ac6.tar.gz scummvm-rg350-c8d0270510ea09c9080759e1cbd353ba07391ac6.tar.bz2 scummvm-rg350-c8d0270510ea09c9080759e1cbd353ba07391ac6.zip | |
PLUGIN_PREFIX and PLUGIN_SUFFIX moved to Makefile, PLUGIN_EXTRA_DEPS added.
svn-id: r14687
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | Makefile.common | 10 | ||||
| -rw-r--r-- | common.rules | 4 |
3 files changed, 14 insertions, 12 deletions
@@ -29,6 +29,18 @@ CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion 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 # ####################################################################### diff --git a/Makefile.common b/Makefile.common index c4f4f9b1e0..bb2d5383e8 100644 --- a/Makefile.common +++ b/Makefile.common @@ -28,16 +28,6 @@ DEPDIR := .deps ###################################################################### -# 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 ###################################################################### diff --git a/common.rules b/common.rules index e48bf98f1b..9a1e4a56ba 100644 --- a/common.rules +++ b/common.rules @@ -11,8 +11,8 @@ ifdef PLUGIN # 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)) |