diff options
| author | D G Turner | 2013-11-07 12:58:34 +0100 |
|---|---|---|
| committer | D G Turner | 2013-11-24 00:48:01 +0000 |
| commit | ef85456859e466adc8913041e4f31809485c45ab (patch) | |
| tree | 359b1686396e12621f659429c857f11cdfbbf3c6 /Makefile.common | |
| parent | 1ac01d2333af11d403ef84dd5192abb18814e5b3 (diff) | |
| download | scummvm-rg350-ef85456859e466adc8913041e4f31809485c45ab.tar.gz scummvm-rg350-ef85456859e466adc8913041e4f31809485c45ab.tar.bz2 scummvm-rg350-ef85456859e466adc8913041e4f31809485c45ab.zip | |
BUILD: Remove need for engine.mk in each engine directory.
Each engine now only has to provide a single configure.engine file
adding the engine into the configure script, which then produces the
required other files automatically.
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 0b2f8a564a..b56300a115 100644 --- a/Makefile.common +++ b/Makefile.common @@ -16,9 +16,7 @@ all: $(EXECUTABLE) plugins PLUGINS := MODULES := test devtools base $(MODULES) -ENGINE_SUBDIRS_MK := $(wildcard $(srcdir)/engines/*/engine.mk) -# Include the build instructions for all engines --include $(ENGINE_SUBDIRS_MK) +-include engines/engines.mk # After the game specific modules follow the shared modules MODULES += \ @@ -81,7 +79,7 @@ $(EXECUTABLE): $(OBJS) $(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@ distclean: clean clean-devtools - $(RM) config.h config.mk config.log engines/plugins_table.h + $(RM) config.h config.mk config.log engines/engines.mk engines/plugins_table.h clean: $(RM_REC) $(DEPDIRS) @@ -149,7 +147,7 @@ endif # recreate them (which it can't), and in particular from looking for potential # source files. This can save quite a bit of disk access time. .PHONY: $(wildcard $(addsuffix /*.d,$(DEPDIRS))) $(addprefix $(srcdir)/, $(addsuffix /module.mk,$(MODULES))) \ - $(srcdir)/$(port_mk) $(srcdir)/rules.mk $ENGINE_SUBDIRS_MK + $(srcdir)/$(port_mk) $(srcdir)/rules.mk ###################################################################### # Get the current version information |