diff options
| author | Max Horn | 2008-01-13 17:05:43 +0000 |
|---|---|---|
| committer | Max Horn | 2008-01-13 17:05:43 +0000 |
| commit | 696ea9d301cae1f2a123c37ddaa7490544cd99a0 (patch) | |
| tree | 7ac7d9a83c250ce1abaec2d2cea030d73467e7cd /Makefile | |
| parent | 79e1579cb3119a70677f7c7c158c5e7686b65f6d (diff) | |
| download | scummvm-rg350-696ea9d301cae1f2a123c37ddaa7490544cd99a0.tar.gz scummvm-rg350-696ea9d301cae1f2a123c37ddaa7490544cd99a0.tar.bz2 scummvm-rg350-696ea9d301cae1f2a123c37ddaa7490544cd99a0.zip | |
Various small patches to the build system by jvprat
svn-id: r30473
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -36,6 +36,19 @@ CXXFLAGS+= -fno-rtti -fno-exceptions -fcheck-new #CXXFLAGS+= -O -Wuninitialized ####################################################################### +# Default commands - put the necessary replacements in config.mk # +####################################################################### + +CAT ?= cat +CP ?= cp +ECHO ?= printf +INSTALL ?= install +MKDIR ?= mkdir -p +RM ?= rm -f +RM_REC ?= $(RM) -r +ZIP ?= zip -q + +####################################################################### # Misc stuff - you should never have to edit this # ####################################################################### @@ -44,8 +57,8 @@ EXECUTABLE := scummvm$(EXEEXT) include $(srcdir)/Makefile.common # check if configure has been run or has been changed since last run -config.mk: $(srcdir)/configure -ifdef CONFIG_MK_IS_PRESENT +config.h config.mk: $(srcdir)/configure +ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk" @echo "Running $(srcdir)/configure with the last specified parameters" @sleep 2s LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \ |