aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan J. Martínez <jjm@usebox.net>2021-09-21 15:14:24 +0000
committerJuan J. Martínez <jjm@usebox.net>2021-09-21 15:14:24 +0000
commit6d66d684e8093f1dd76808d74efb4608cb69cdc2 (patch)
tree8c57f5c77c6973707d5b23dbc850049647d83ec7
parent65cb5c99ceda078b03e44740613a89963c3fb088 (diff)
parent1997ccb1eab50c4f401ff49bc306a8d9f7267328 (diff)
downloadubox-msx-lib-6d66d684e8093f1dd76808d74efb4608cb69cdc2.tar.gz
ubox-msx-lib-6d66d684e8093f1dd76808d74efb4608cb69cdc2.zip
Merge branch 'master' into 'master'
Avoiding improper makefile invocations See merge request reidrac/ubox-msx-lib!9
-rw-r--r--Makefile2
-rw-r--r--game/Makefile5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0eb056f..46de89b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ libs: lib ubox spman mplayer ap
game: bin libs
make -C tools
- make -C game
+ make -C game all
docs:
make -C docs
diff --git a/game/Makefile b/game/Makefile
index df14313..6c3d855 100644
--- a/game/Makefile
+++ b/game/Makefile
@@ -1,3 +1,6 @@
+default:
+ $(error Please use the Makefile from root directory)
+
all: generated bin build
make -C data
cd src && ../../tools/mkdeps.py -b ../build -I ../generated:../../include ./ Makefile.deps
@@ -12,7 +15,7 @@ bin:
build:
mkdir -p ./build
-.PHONY: all clean
+.PHONY: all clean default
clean:
rm -rf ./generated ./bin ./build
make -C src clean