diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2008-01-28 01:11:37 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2008-01-28 01:11:37 +0000 |
commit | 32fe1bd1bfcaa2c96cd407c3d1e20f2d4000bd0b (patch) | |
tree | af681bf540f97a6471d80955e7cfe0380decad69 /makefile | |
parent | 49fce64c1a9a76e8ef9062e90932df3f55073508 (diff) | |
download | netsurf-32fe1bd1bfcaa2c96cd407c3d1e20f2d4000bd0b.tar.gz netsurf-32fe1bd1bfcaa2c96cd407c3d1e20f2d4000bd0b.tar.bz2 |
Replace accidentally checked in files with previous ones.
svn path=/trunk/netsurf/; revision=3786
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 30 |
1 files changed, 14 insertions, 16 deletions
@@ -72,23 +72,8 @@ 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 +OBJDIR_RISCOS = $(shell $(CC) -dumpmachine) SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c) OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o) @@ -106,6 +91,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 |