From 93616157862ab9557c42494e23fc96d9d4de21d1 Mon Sep 17 00:00:00 2001 From: LelixSuper Date: Wed, 6 Apr 2016 13:21:29 +0200 Subject: [PATCH] Fix Makefile files I've added .PHONY targets and fixed "clean" recipe. --- src/Makefile | 26 ++++++++++++++------------ templates/advance_game/Makefile | 13 ++++++++----- templates/basic_game/Makefile | 5 ++++- templates/basic_test/Makefile | 5 ++++- templates/simple_game/Makefile | 5 ++++- templates/standard_game/Makefile | 13 ++++++++----- 6 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/Makefile b/src/Makefile index 76dbfc67..12f4609b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -21,6 +21,8 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB PLATFORM ?= PLATFORM_DESKTOP @@ -97,9 +99,9 @@ else endif -# typing 'make' will invoke the first target entry in the file, -# in this case, the 'default' target entry is raylib -default: raylib +# typing 'make' will invoke the default target entry called 'all', +# in this case, the 'default' target entry is basic_game +all: raylib # compile raylib library raylib: $(OBJS) @@ -161,21 +163,21 @@ gestures.o: gestures.c # clean everything clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) - ifeq ($(PLATFORM_OS),OSX) - rm -f *.o libraylib.a - else - ifeq ($(PLATFORM_OS),LINUX) - rm -f *.o libraylib.a - else + ifeq ($(PLATFORM_OS),WINDOWS) del *.o libraylib.a + else + rm -f *.o libraylib.a endif +endif +ifeq ($(PLATFORM),PLATFORM_WEB) + ifeq ($(PLATFORM_OS),WINDOWS) + del *.o libraylib.bc + else + rm -f *.o libraylib.bc endif endif ifeq ($(PLATFORM),PLATFORM_RPI) rm -f *.o libraylib.a -endif -ifeq ($(PLATFORM),PLATFORM_WEB) - del *.o libraylib.bc endif @echo Cleaning done diff --git a/templates/advance_game/Makefile b/templates/advance_game/Makefile index 17b16c1a..ee982de4 100644 --- a/templates/advance_game/Makefile +++ b/templates/advance_game/Makefile @@ -23,6 +23,8 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() @@ -202,21 +204,22 @@ clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) find . -type f -perm +ugo+x -delete - rm -f *.o + rm -f screens/*.o else ifeq ($(PLATFORM_OS),LINUX) - find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -f + find . -type f -executable -delete + rm -f screens/*.o else - del *.o *.exe + del screens\*.o *.exe endif endif endif ifeq ($(PLATFORM),PLATFORM_RPI) find . -type f -executable -delete - rm -f *.o + rm -f screens/*.o endif ifeq ($(PLATFORM),PLATFORM_WEB) - del *.o *.html *.js + del screens/*.o *.html *.js endif @echo Cleaning done diff --git a/templates/basic_game/Makefile b/templates/basic_game/Makefile index f512a180..3b2a06d0 100644 --- a/templates/basic_game/Makefile +++ b/templates/basic_game/Makefile @@ -23,6 +23,8 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() @@ -177,7 +179,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) rm -f *.o else ifeq ($(PLATFORM_OS),LINUX) - find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -f + find . -type f -executable -delete + rm -f *.o else del *.o *.exe endif diff --git a/templates/basic_test/Makefile b/templates/basic_test/Makefile index 95b8cd15..b08aacdf 100644 --- a/templates/basic_test/Makefile +++ b/templates/basic_test/Makefile @@ -23,6 +23,8 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() @@ -176,7 +178,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) rm -f *.o else ifeq ($(PLATFORM_OS),LINUX) - find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -f + find . -type f -executable -delete + rm -f *.o else del *.o *.exe endif diff --git a/templates/simple_game/Makefile b/templates/simple_game/Makefile index de3401f7..6a3adcc8 100644 --- a/templates/simple_game/Makefile +++ b/templates/simple_game/Makefile @@ -23,6 +23,8 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() @@ -181,7 +183,8 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP) rm -f *.o else ifeq ($(PLATFORM_OS),LINUX) - find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -f + find . -type f -executable -delete + rm -f screens/*.o else del *.o *.exe endif diff --git a/templates/standard_game/Makefile b/templates/standard_game/Makefile index c88c8211..4629d1b1 100644 --- a/templates/standard_game/Makefile +++ b/templates/standard_game/Makefile @@ -23,6 +23,8 @@ # #************************************************************************************************** +.PHONY: all clean + # define raylib platform to compile for # possible platforms: PLATFORM_DESKTOP PLATFORM_RPI PLATFORM_WEB # WARNING: To compile to HTML5, code must be redesigned to use emscripten.h and emscripten_set_main_loop() @@ -202,21 +204,22 @@ clean: ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM_OS),OSX) find . -type f -perm +ugo+x -delete - rm -f *.o + rm -f screens/*.o else ifeq ($(PLATFORM_OS),LINUX) - find -type f -executable | xargs file -i | grep -E 'x-object|x-archive|x-sharedlib|x-executable' | rev | cut -d ':' -f 2- | rev | xargs rm -f + find . -type f -executable -delete + rm -f screens/*.o else - del *.o *.exe + del screens\*.o *.exe endif endif endif ifeq ($(PLATFORM),PLATFORM_RPI) find . -type f -executable -delete - rm -f *.o + rm -f screens/*.o endif ifeq ($(PLATFORM),PLATFORM_WEB) - del *.o *.html *.js + del screens/*.o *.html *.js endif @echo Cleaning done