This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit c41188e62084ea00cc9bf023038701d4e54c81f3
Author: Simon McVittie <s...@debian.org>
Date: Tue Jul 14 22:51:53 2015 +0100
Makefile: confine $(LIB) to the one platform that needs it, namely irix64
It isn't mentioned anywhere else, and deleting it from the Linux code
path means we don't need to maintain an exhaustive list of 64-bit
architectures.
---
MP/Makefile | 19 +------------------
SP/Makefile | 19 +------------------
2 files changed, 2 insertions(+), 36 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index 54de74e..f718ee4 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -355,8 +355,6 @@ endif
#############################################################################
## Defaults
-LIB=lib
-
INSTALL=install
MKDIR=mkdir
EXTRA_FILES=
@@ -364,22 +362,6 @@ CLIENT_EXTRA_FILES=
ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"
"gnu"))
- ifeq ($(ARCH),x86_64)
- LIB=lib64
- else
- ifeq ($(ARCH),ppc64)
- LIB=lib64
- else
- ifeq ($(ARCH),s390x)
- LIB=lib64
- else
- ifeq ($(ARCH),aarch64)
- LIB=lib64
- endif
- endif
- endif
- endif
-
BASE_CFLAGS = -Wall -fno-strict-aliasing \
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -908,6 +890,7 @@ else # ifeq netbsd
#############################################################################
ifeq ($(PLATFORM),irix64)
+ LIB=lib
ARCH=mips
diff --git a/SP/Makefile b/SP/Makefile
index 5aeb31e..8f5b3c0 100644
--- a/SP/Makefile
+++ b/SP/Makefile
@@ -347,8 +347,6 @@ endif
#############################################################################
## Defaults
-LIB=lib
-
INSTALL=install
MKDIR=mkdir
EXTRA_FILES=
@@ -356,22 +354,6 @@ CLIENT_EXTRA_FILES=
ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu"
"gnu"))
- ifeq ($(ARCH),x86_64)
- LIB=lib64
- else
- ifeq ($(ARCH),ppc64)
- LIB=lib64
- else
- ifeq ($(ARCH),s390x)
- LIB=lib64
- else
- ifeq ($(ARCH),aarch64)
- LIB=lib64
- endif
- endif
- endif
- endif
-
BASE_CFLAGS = -Wall -fno-strict-aliasing \
-pipe -DUSE_ICON
CLIENT_CFLAGS += $(SDL_CFLAGS)
@@ -900,6 +882,7 @@ else # ifeq netbsd
#############################################################################
ifeq ($(PLATFORM),irix64)
+ LIB=lib
ARCH=mips
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
