From 45dd236662afc2cb14afca98eedb45af47584053 Mon Sep 17 00:00:00 2001 From: Allanis Date: Sat, 4 Jan 2014 02:26:24 +0000 Subject: [PATCH] [Change] Some more Makefile improvements. --- bin/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 2d773a7..05b8f58 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -90,7 +90,7 @@ DATA := ldata DATAFILES := $(DATA_AI) $(DATA_GFX) $(DATA_XML) $(DATA_SND) $(DATA_MISN) # TARGETS. -.PHONY: all clean purge +.PHONY: all help lua utils docs clean purge %.o: %.c %.h @$(CC) -c $(CFLAGS) -o $@ $< @@ -114,13 +114,14 @@ lephisto: $(OBJS) @echo -e "\tLD $(APPNAME)" lua: - @if [ ! -e ../lib/lua/liblua.a ]; then make -C ../lib/lua a; fi + @if [ ! -e ../lib/lua/liblua.a ]; then $(MAKE) -C ../lib/lua a; fi + pack: ../src/md5.c ../src/pack.c ../utils/pack/main.c - @make -C ../utils/pack + @$(MAKE) -C ../utils/pack mksprite: ../utils/mkspr/main.c - @make -C ../utils/mkspr + @$(MAKE) -C ../utils/mkspr $(VERSIONFILE): @echo -n "$(VMAJOR).$(VMINOR).$(VREV)" > $(VERSIONFILE) @@ -143,10 +144,10 @@ clean: purge: clean @echo -e "\tCleaning utilites" - @make -C ../utils/pack clean - @make -C ../utils/mkspr clean + @$(MAKE) -C ../utils/pack clean + @$(MAKE) -C ../utils/mkspr clean @echo -e "\tCleaning Lua" - @make -C ../lib/lua clean + @$(MAKE) -C ../lib/lua clean @echo -e "\tRemoving binaries." @$(RM) Lephisto mksprite ldata pack gmon.out VERSION