summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2008-02-03 18:54:21 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2008-02-03 18:54:21 +0000
commit61e70fee80e4fc7737798637e8f2fc54a0d69b9b (patch)
tree58e1b8679b8ec8c4eee9dc1f81556434516f0e28 /makefile
parent7177f59309448207d741c9ad30294d57e6e2e4e8 (diff)
downloadnetsurf-61e70fee80e4fc7737798637e8f2fc54a0d69b9b.tar.gz
netsurf-61e70fee80e4fc7737798637e8f2fc54a0d69b9b.tar.bz2
Fix makefile and RISC OS !Run file.
svn path=/trunk/netsurf/; revision=3834
Diffstat (limited to 'makefile')
-rw-r--r--makefile36
1 files changed, 18 insertions, 18 deletions
diff --git a/makefile b/makefile
index 4298c57db..ec4941b84 100644
--- a/makefile
+++ b/makefile
@@ -72,27 +72,14 @@ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \
gtk_history.o gtk_window.o gtk_filetype.o \
gtk_download.o # gtk/
-# Default target - platform specific files may specify special-case rules for
-# various files.
-default: riscos
-
-
-# Inclusion of platform specific files has to occur after the OBJDIR stuff as
-# that is referred to in the files
-
-OS = riscos
-ifeq ($(OS),riscos)
-include riscos.mk
-else
-include posix.mk
-endif
-
-
-OBJDIR_RISCOS = arm-riscos-aof
+# This makes me want to vomit, but is necessary to avoid a load of
+# "make: /home/riscos/cross/bin/gcc: Command not found." if there's no GCCSDK
+# installed on the build machine. The new build system can't happen soon enough
+OBJDIR_RISCOS = $(shell $(CC) -dumpmachine 2>/dev/null || echo arm-riscos-aof)
SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c)
OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o)
-OBJDIR_RISCOS_SMALL = $(shell $(CC) -dumpmachine)-small
+OBJDIR_RISCOS_SMALL = $(OBJDIR_RISCOS)-small
SOURCES_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:.o=.c)
OBJS_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:%.o=$(OBJDIR_RISCOS_SMALL)/%.o)
@@ -106,6 +93,19 @@ OBJDIR_GTK = objects-gtk
SOURCES_GTK=$(OBJECTS_GTK:.o=.c)
OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o)
+# Default target - platform specific files may specify special-case rules for
+# various files.
+default: riscos
+
+# Inclusion of platform specific files has to occur after the OBJDIR stuff as
+# that is referred to in the files
+
+OS = $(word 2,$(subst -, ,$(shell $(SYSTEM_CC) -dumpmachine)))
+ifeq ($(OS),riscos)
+include riscos.mk
+else
+include posix.mk
+endif
VPATH = content:content/fetchers:css:desktop:image:render:riscos:riscos/configure:riscos/gui:utils:debug:gtk