aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMax Horn2006-06-24 08:48:11 +0000
committerMax Horn2006-06-24 08:48:11 +0000
commit9a955180a4179237d3474a73c6829a6554a9bc09 (patch)
tree0bd1edc157e90b6b71241ef2a03642f8a0b3c827 /Makefile
parentd210b19aec69d34711e5d473e6e4e5081955b02e (diff)
downloadscummvm-rg350-9a955180a4179237d3474a73c6829a6554a9bc09.tar.gz
scummvm-rg350-9a955180a4179237d3474a73c6829a6554a9bc09.tar.bz2
scummvm-rg350-9a955180a4179237d3474a73c6829a6554a9bc09.zip
* Renamed config.mak to config.mk
* Renamed common.rules to rules.mk * Removed explicit declaration of MODULE_DIRS in various spots (instead we let rules.mk compute it) svn-id: r23275
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a46bc8b868..8f03a4bc0a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ MODULES :=
MODULE_DIRS :=
# Load the make rules generated by configure
-include config.mak
+include config.mk
CXXFLAGS:= -Wall $(CXXFLAGS)
CXXFLAGS+= -O -Wuninitialized
@@ -38,7 +38,7 @@ EXECUTABLE := scummvm$(EXEEXT)
include $(srcdir)/Makefile.common
# check if configure has been run or has been changed since last run
-config.mak: $(srcdir)/configure
+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