From 120e947d6e44e8c5404127ee074e616fab5c690a Mon Sep 17 00:00:00 2001 From: Dan Cross Date: Tue, 9 Oct 2018 15:55:09 +0000 Subject: [PATCH] Rename Makefiles to GNUmakefiles. GNU make is a requirement to build Magicka: make this explicit with the naming of the files. Signed-off-by: Dan Cross --- GNUmakefile | 17 ++++++++ Makefile | 39 ------------------- src/{Makefile.freebsd => GNUmakefile.freebsd} | 0 ...le.freebsd.WWW => GNUmakefile.freebsd.WWW} | 0 src/{Makefile.linux => GNUmakefile.linux} | 0 ...kefile.linux.WWW => GNUmakefile.linux.WWW} | 0 src/{Makefile.netbsd => GNUmakefile.netbsd} | 0 ...file.netbsd.WWW => GNUmakefile.netbsd.WWW} | 0 src/{Makefile.openbsd => GNUmakefile.openbsd} | 0 ...le.openbsd.WWW => GNUmakefile.openbsd.WWW} | 0 src/{Makefile.osx => GNUmakefile.osx} | 0 src/{Makefile.osx.WWW => GNUmakefile.osx.WWW} | 0 src/{Makefile.sunos => GNUmakefile.sunos} | 0 ...kefile.sunos.WWW => GNUmakefile.sunos.WWW} | 0 14 files changed, 17 insertions(+), 39 deletions(-) create mode 100644 GNUmakefile delete mode 100644 Makefile rename src/{Makefile.freebsd => GNUmakefile.freebsd} (100%) rename src/{Makefile.freebsd.WWW => GNUmakefile.freebsd.WWW} (100%) rename src/{Makefile.linux => GNUmakefile.linux} (100%) rename src/{Makefile.linux.WWW => GNUmakefile.linux.WWW} (100%) rename src/{Makefile.netbsd => GNUmakefile.netbsd} (100%) rename src/{Makefile.netbsd.WWW => GNUmakefile.netbsd.WWW} (100%) rename src/{Makefile.openbsd => GNUmakefile.openbsd} (100%) rename src/{Makefile.openbsd.WWW => GNUmakefile.openbsd.WWW} (100%) rename src/{Makefile.osx => GNUmakefile.osx} (100%) rename src/{Makefile.osx.WWW => GNUmakefile.osx.WWW} (100%) rename src/{Makefile.sunos => GNUmakefile.sunos} (100%) rename src/{Makefile.sunos.WWW => GNUmakefile.sunos.WWW} (100%) diff --git a/GNUmakefile b/GNUmakefile new file mode 100644 index 0000000..24833bc --- /dev/null +++ b/GNUmakefile @@ -0,0 +1,17 @@ +OS := $(shell uname -s | tr '[A-Z]' '[a-z]' | sed 's/darwin/osx/') + +all: magicka + +.PHONY: magicka www clean cleanwww + +magicka: + cd src && $(MAKE) -f GNUmakefile.$(OS) + +www: + cd src && $(MAKE) -f GNUmakefile.$(OS).WWW + +clean: + cd src && $(MAKE) -f GNUmakefile.$(OS) clean + +cleanwww: + cd src && $(MAKE) -f GNUmakefile.$(OS).WWW clean diff --git a/Makefile b/Makefile deleted file mode 100644 index a314020..0000000 --- a/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -OS := $(shell uname -s) - -ifeq ($(OS), DragonFly) - MAKEFILE=Makefile.freebsd -endif -ifeq ($(OS), FreeBSD) - MAKEFILE=Makefile.freebsd -endif -ifeq ($(OS), NetBSD) - MAKEFILE=Makefile.netbsd -endif -ifeq ($(OS), Linux) - MAKEFILE=Makefile.linux -endif -ifeq ($(OS), Darwin) - MAKEFILE=Makefile.osx -endif -ifeq ($(OS), SunOS) - MAKEFILE=Makefile.sunos -endif -ifeq ($(OS), OpenBSD) - MAKEFILE=Makefile.openbsd -endif - -all: magicka - -.PHONY: magicka www clean cleanwww - -magicka: - cd src && $(MAKE) -f $(MAKEFILE) - -www: - cd src && $(MAKE) -f $(MAKEFILE).WWW - -clean: - cd src && $(MAKE) -f $(MAKEFILE) clean - -cleanwww: - cd src && $(MAKE) -f $(MAKEFILE).WWW clean diff --git a/src/Makefile.freebsd b/src/GNUmakefile.freebsd similarity index 100% rename from src/Makefile.freebsd rename to src/GNUmakefile.freebsd diff --git a/src/Makefile.freebsd.WWW b/src/GNUmakefile.freebsd.WWW similarity index 100% rename from src/Makefile.freebsd.WWW rename to src/GNUmakefile.freebsd.WWW diff --git a/src/Makefile.linux b/src/GNUmakefile.linux similarity index 100% rename from src/Makefile.linux rename to src/GNUmakefile.linux diff --git a/src/Makefile.linux.WWW b/src/GNUmakefile.linux.WWW similarity index 100% rename from src/Makefile.linux.WWW rename to src/GNUmakefile.linux.WWW diff --git a/src/Makefile.netbsd b/src/GNUmakefile.netbsd similarity index 100% rename from src/Makefile.netbsd rename to src/GNUmakefile.netbsd diff --git a/src/Makefile.netbsd.WWW b/src/GNUmakefile.netbsd.WWW similarity index 100% rename from src/Makefile.netbsd.WWW rename to src/GNUmakefile.netbsd.WWW diff --git a/src/Makefile.openbsd b/src/GNUmakefile.openbsd similarity index 100% rename from src/Makefile.openbsd rename to src/GNUmakefile.openbsd diff --git a/src/Makefile.openbsd.WWW b/src/GNUmakefile.openbsd.WWW similarity index 100% rename from src/Makefile.openbsd.WWW rename to src/GNUmakefile.openbsd.WWW diff --git a/src/Makefile.osx b/src/GNUmakefile.osx similarity index 100% rename from src/Makefile.osx rename to src/GNUmakefile.osx diff --git a/src/Makefile.osx.WWW b/src/GNUmakefile.osx.WWW similarity index 100% rename from src/Makefile.osx.WWW rename to src/GNUmakefile.osx.WWW diff --git a/src/Makefile.sunos b/src/GNUmakefile.sunos similarity index 100% rename from src/Makefile.sunos rename to src/GNUmakefile.sunos diff --git a/src/Makefile.sunos.WWW b/src/GNUmakefile.sunos.WWW similarity index 100% rename from src/Makefile.sunos.WWW rename to src/GNUmakefile.sunos.WWW