diff options
| author | Max Horn | 2007-11-06 17:23:33 +0000 |
|---|---|---|
| committer | Max Horn | 2007-11-06 17:23:33 +0000 |
| commit | b820b661c7b691cfcb86408954cde6f71da5654e (patch) | |
| tree | 21db4c49a7c9edd852013e1050090a26a71c91f0 /Makefile | |
| parent | 443dff5285f0654be4a6f843b8262bd07bb95036 (diff) | |
| download | scummvm-rg350-b820b661c7b691cfcb86408954cde6f71da5654e.tar.gz scummvm-rg350-b820b661c7b691cfcb86408954cde6f71da5654e.tar.bz2 scummvm-rg350-b820b661c7b691cfcb86408954cde6f71da5654e.zip | |
Patch #1826459: Make: reconfigure on configure change (saving environment)
svn-id: r29435
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -16,7 +16,7 @@ MODULES := MODULE_DIRS := # Load the make rules generated by configure -include config.mk +-include config.mk CXXFLAGS:= -Wall $(CXXFLAGS) CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas @@ -44,9 +44,14 @@ include $(srcdir)/Makefile.common # check if configure has been run or has been changed since last run config.mk: $(srcdir)/configure - @echo "You need to run ./configure before you can run make" - @echo "Either you haven't run it before or it has changed." - @exit 1 +ifdef CONFIG_MK_IS_PRESENT + @echo "Running $(srcdir)/configure with the last specified parameters" + @sleep 2s + @LDFLAGS=$(SAVED_LDFLAGS) CXX=$(SAVED_CXX) CXXFLAGS=$(SAVED_CXXFLAGS) CPPFLAGS=$(SAVED_CPPFLAGS) \ + $(srcdir)/configure $(SAVED_CONFIGFLAGS) +else + $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) +endif install: all $(INSTALL) -d "$(DESTDIR)$(BINDIR)" |