From 2c98147749b04c28a566b8c0f5008427e19ae2a9 Mon Sep 17 00:00:00 2001
From: John Tytgat <joty@netsurf-browser.org>
Date: Sun, 28 Sep 2008 20:35:57 +0000
Subject: GCCSDK 4 build compatibility (not finished yet)

svn path=/trunk/libnsbmp/; revision=5458
---
 Makefile | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 3db204b..6be4ed5 100644
--- a/Makefile
+++ b/Makefile
@@ -18,29 +18,29 @@ SED = sed
 DOXYGEN = doxygen
 
 ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+  GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+  GCCSDK_INSTALL_ENV ?= /home/riscos/env
+  CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+  AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+  CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include
+  LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
+  ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+    EXEEXT := ,e1f
+    SUBTARGET := -elf-
+  else
+    EXEEXT := ,ff8
+    SUBTARGET := -aof-
+  endif
+  PREFIX = $(GCCSDK_INSTALL_ENV)
 else
-CFLAGS += -g
-LIBS =
-PREFIX = /usr/local
+  CFLAGS += -g
+  LIBS =
+  PREFIX = /usr/local
 endif
 
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
 
 OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))
 
-- 
cgit v1.2.3