summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2008-01-28 00:58:31 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2008-01-28 00:58:31 +0000
commit49fce64c1a9a76e8ef9062e90932df3f55073508 (patch)
treefe75361b99017dd575f1aef41cf00a8ab2e286f5 /makefile
parent48bdeb34c87d2124ce0bfbd885e14b1bb1695ce2 (diff)
downloadnetsurf-49fce64c1a9a76e8ef9062e90932df3f55073508.tar.gz
netsurf-49fce64c1a9a76e8ef9062e90932df3f55073508.tar.bz2
Fix vertical position of images with margin/borders/padding.
svn path=/trunk/netsurf/; revision=3785
Diffstat (limited to 'makefile')
-rw-r--r--makefile30
1 files changed, 16 insertions, 14 deletions
diff --git a/makefile b/makefile
index cd1224480..4298c57db 100644
--- a/makefile
+++ b/makefile
@@ -72,8 +72,23 @@ 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 = $(shell $(CC) -dumpmachine)
+
+OBJDIR_RISCOS = arm-riscos-aof
SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c)
OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o)
@@ -91,19 +106,6 @@ 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