From 5141da86fdbabf11cc0c864625004a14b96c0943 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Fri, 7 Mar 2008 18:51:53 +0000
Subject: Put old make files and !Run file back.

svn path=/trunk/netsurf/; revision=3896
---
 !NetSurf/!Run,feb |  2 +-
 makefile          | 36 ++++++++++++++++++------------------
 riscos.mk         |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/!NetSurf/!Run,feb b/!NetSurf/!Run,feb
index 156435039..7828c21fc 100644
--- a/!NetSurf/!Run,feb
+++ b/!NetSurf/!Run,feb
@@ -99,7 +99,7 @@ CDir <Wimp$ScrapDir>.WWW.NetSurf
 | NB: trailing dot is required
 FontInstall NetSurf:Resources.Fonts.
 
-WimpSlot -min 3540k -max 3540k
+WimpSlot -min 2240k -max 2240k
 Run <NetSurf$Dir>.!RunImage -v %*0 2><Wimp$ScrapDir>.WWW.NetSurf.Log
 
 | Uninstall NetSurf-specific fonts
diff --git a/makefile b/makefile
index 3d2b131d4..b033c0fa6 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
 
diff --git a/riscos.mk b/riscos.mk
index 91af87fd7..3ca148104 100644
--- a/riscos.mk
+++ b/riscos.mk
@@ -9,7 +9,7 @@ PLATFORM_AFLAGS_RISCOS = -mthrowback -IOSLib:
 LDFLAGS_RISCOS = NSLibs:lib/libxml2 NSLibs:lib/libz NSLibs:lib/libcurl \
 	NSLibs:lib/libssl NSLibs:lib/libcrypto NSLibs:lib/libcares \
 	NSLibs:lib/libmng NSLibs:lib/libjpeg NSLibs:lib/librufl NSLibs:lib/libpencil \
-	OSLib:o.OSLib32 NSLibs:lib/libsvgtiny
+	OSLib:o.OSLib32
 LDFLAGS_SMALL = NSLibs:lib/libxml2 NSLibs:lib/libz NSLibs:lib/libcurl \
 	NSLibs:lib/libares NSLibs:lib/libmng \
 	NSLibs:lib/libjpeg OSLib:o.oslib32
-- 
cgit v1.2.3