diff options
| author | anotherguest | 2013-11-26 12:14:38 +0100 |
|---|---|---|
| committer | anotherguest | 2013-11-26 12:14:38 +0100 |
| commit | 44947f5bdb45095793f1e994385f051d534d53ee (patch) | |
| tree | 7bfc07044c7a1d585fa5145ef91bfb6f9fb6e242 /Makefile | |
| parent | ed357a6dfacd2fd41366d2baf61bd344fec9a0a0 (diff) | |
| parent | 0e017f007a8a3db8c8d8320f76cbfd423e662e07 (diff) | |
| download | scummvm-rg350-44947f5bdb45095793f1e994385f051d534d53ee.tar.gz scummvm-rg350-44947f5bdb45095793f1e994385f051d534d53ee.tar.bz2 scummvm-rg350-44947f5bdb45095793f1e994385f051d534d53ee.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -82,7 +82,8 @@ EXECUTABLE := $(EXEPRE)scummvm$(EXEEXT) include $(srcdir)/Makefile.common # check if configure has been run or has been changed since last run -config.h config.mk: $(srcdir)/configure $(srcdir)/engines/configure.engines +ENGINE_SUBDIRS_CONFIGURE := $(wildcard $(srcdir)/engines/*/configure.engine) +config.h: $(srcdir)/configure $(ENGINE_SUBDIRS_CONFIGURE) ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk" @echo "Running $(srcdir)/configure with the last specified parameters" @sleep 2 @@ -94,6 +95,14 @@ else $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) endif +config.mk engines/plugins_table.h engines/engines.mk: config.h + @if test -f $@; then \ + touch $@; \ + else \ + rm -f config.h; \ + $(MAKE) config.h; \ + fi + ifneq ($(origin port_mk), undefined) include $(srcdir)/$(port_mk) endif |