Author: jmb
Date: Sat Jul 21 23:17:07 2007
New Revision: 3454
URL:
http://source.netsurf-browser.org?rev=3454&view=rev
Log:
Purge NCOS build options; these have been redundant for ages.
Modified:
trunk/netsurf/makefile
trunk/netsurf/posix.mk
trunk/netsurf/riscos.mk
trunk/netsurf/utils/config.h
Modified: trunk/netsurf/makefile
URL:
http://source.netsurf-browser.org/trunk/netsurf/makefile?rev=3454&r1=...
==============================================================================
--- trunk/netsurf/makefile (original)
+++ trunk/netsurf/makefile Sat Jul 21 23:17:07 2007
@@ -9,12 +9,11 @@
# riscos -- standard RISC OS build
# riscos_small -- identical to "riscos", but linked with smaller libraries
# (no openssl, and libcurl without ssl support)
-# ncos -- NCOS build (variant of RISC OS for Network Computers)
# debug -- command line Unix/Linux, for debugging
# riscos_debug -- a cross between "riscos" and "debug"
# gtk -- experimental gtk version
#
-# "riscos", "riscos_small", "ncos", and
"riscos_debug" can be compiled under
+# "riscos", "riscos_small", and "riscos_debug" can be
compiled under
# RISC OS, or cross-compiled using GCCSDK.
SYSTEM_CC ?= gcc
@@ -53,8 +52,6 @@
OBJECTS_RISCOS_SMALL = $(OBJECTS_RISCOS)
-OBJECTS_NCOS = $(OBJECTS_RISCOS)
-
OBJECTS_DEBUG = $(OBJECTS_COMMON) $(OBJECTS_IMAGE)
OBJECTS_DEBUG += debug_bitmap.o filetyped.o fontd.o netsurfd.o # debug/
@@ -83,10 +80,6 @@
SOURCES_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:.o=.c)
OBJS_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:%.o=$(OBJDIR_RISCOS_SMALL)/%.o)
-OBJDIR_NCOS = arm-ncos-aof
-SOURCES_NCOS=$(OBJECTS_NCOS:.o=.c)
-OBJS_NCOS=$(OBJECTS_NCOS:%.o=$(OBJDIR_NCOS)/%.o)
-
OBJDIR_DEBUG = $(shell $(SYSTEM_CC) -dumpmachine)-debug
SOURCES_DEBUG=$(OBJECTS_DEBUG:.o=.c)
OBJS_DEBUG=$(OBJECTS_DEBUG:%.o=$(OBJDIR_DEBUG)/%.o)
@@ -125,7 +118,6 @@
$(WARNFLAGS) -I. $(PLATFORM_CFLAGS_RISCOS) -mpoke-function-name \
# -include utils/memdebug.h
CFLAGS_RISCOS_SMALL = $(CFLAGS_RISCOS) -Dsmall
-CFLAGS_NCOS = $(CFLAGS_RISCOS) -Dncos
CFLAGS_DEBUG = -std=c99 -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I. \
$(PLATFORM_CFLAGS_DEBUG) -g
CFLAGS_GTK = -std=c99 -Dgtk -Dnsgtk \
@@ -149,7 +141,6 @@
AFLAGS_RISCOS = -I..,. $(PLATFORM_AFLAGS_RISCOS)
AFLAGS_RISCOS_SMALL = $(AFLAGS_RISCOS) -Dsmall
-AFLAGS_NCOS = $(AFLAGS_RISCOS) -Dncos
# targets
riscos: $(RUNIMAGE)
@@ -159,10 +150,6 @@
u!RunImage,ff8 : $(OBJS_RISCOS_SMALL)
$(CC) -o $@ $(LDFLAGS_SMALL) $^
-ncos: $(NCRUNIMAGE)
-$(NCRUNIMAGE) : $(OBJS_NCOS)
- $(CC) -o $@ $(LDFLAGS_RISCOS) $^
-
debug: nsdebug
nsdebug: $(OBJS_DEBUG)
$(CC_DEBUG) -o $@ $(LDFLAGS_DEBUG) $^
@@ -186,9 +173,6 @@
$(OBJDIR_RISCOS_SMALL)/%.o : %.c
@echo "==> $<"
@$(CC) -o $@ -c $(CFLAGS_RISCOS_SMALL) $<
-$(OBJDIR_NCOS)/%.o : %.c
- @echo "==> $<"
- @$(CC) -o $@ -c $(CFLAGS_NCOS) $<
$(OBJDIR_DEBUG)/%.o : %.c
@echo "==> $<"
@$(CC_DEBUG) -o $@ -c $(CFLAGS_DEBUG) $<
@@ -203,9 +187,6 @@
$(OBJDIR_RISCOS_SMALL)/%.o : %.s
@echo "==> $<"
$(ASM) -o $@ -c $(AFLAGS_RISCOS_SMALL) $<
-$(OBJDIR_NCOS)/%.o : %.s
- @echo "==> $<"
- $(ASM) -o $@ -c $(AFLAGS_NCOS) $<
# Generate dependencies.
# To disable automatic regeneration of dependencies (eg. if perl is not
@@ -215,7 +196,7 @@
depend: css/css_enum.c css/parser.c css/scanner.c utils/translit.c */*.[ch] */*/*.[ch]
@echo "--> modified files $?"
@echo "--> updating dependencies"
- @-mkdir -p $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG)
$(OBJDIR_GTK)
- @perl scandeps $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG)
$(OBJDIR_GTK) -- $^ > depend
+ @-mkdir -p $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_DEBUG) $(OBJDIR_GTK)
+ @perl scandeps $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_DEBUG) $(OBJDIR_GTK) --
$^ > depend
include depend
Modified: trunk/netsurf/posix.mk
URL:
http://source.netsurf-browser.org/trunk/netsurf/posix.mk?rev=3454&r1=...
==============================================================================
--- trunk/netsurf/posix.mk (original)
+++ trunk/netsurf/posix.mk Sat Jul 21 23:17:07 2007
@@ -26,7 +26,6 @@
endif
RUNIMAGE = !NetSurf/!RunImage,ff8
-NCRUNIMAGE = !NCNetSurf/!RunImage,ff8
# special cases - in here, cos RISC OS can't cope :(
css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
@@ -40,7 +39,7 @@
# remove generated files - again, RISC OS fails it
clean:
- -rm $(OBJDIR_RISCOS)/* $(OBJDIR_RISCOS_SMALL)/* $(OBJDIR_NCOS)/* \
+ -rm $(OBJDIR_RISCOS)/* $(OBJDIR_RISCOS_SMALL)/* \
$(OBJDIR_DEBUG)/* $(OBJDIR_GTK)/* \
css/css_enum.c css/css_enum.h \
css/parser.c css/parser.h css/scanner.c \
Modified: trunk/netsurf/riscos.mk
URL:
http://source.netsurf-browser.org/trunk/netsurf/riscos.mk?rev=3454&r1...
==============================================================================
--- trunk/netsurf/riscos.mk (original)
+++ trunk/netsurf/riscos.mk Sat Jul 21 23:17:07 2007
@@ -15,7 +15,6 @@
NSLibs:lib/libjpeg OSLib:o.oslib32
RUNIMAGE = !NetSurf/!RunImage
-NCRUNIMAGE = !NCNetSurf/!RunImage
# special cases
css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
@@ -37,7 +36,6 @@
clean:
-wipe $(OBJDIR_RISCOS).* ~CFR~V
-wipe $(OBJDIR_RISCOS_SMALL).* ~CFR~V
- -wipe $(OBJDIR_NCOS).* ~CFR~V
-wipe $(OBJDIR_DEBUG).* ~CFR~V
-wipe $(OBJDIR_GTK).* ~CFR~V
-wipe css.c.css_enum ~CFR~V
Modified: trunk/netsurf/utils/config.h
URL:
http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=3454&a...
==============================================================================
--- trunk/netsurf/utils/config.h (original)
+++ trunk/netsurf/utils/config.h Sat Jul 21 23:17:07 2007
@@ -2,8 +2,7 @@
* This file is part of NetSurf,
http://netsurf-browser.org/
* Licensed under the GNU General Public License,
*
http://www.opensource.org/licenses/gpl-license
- * Copyright 2003,4 John M Bell <jmb202(a)ecs.soton.ac.uk>
- * Copyright 2004 Andrew Timmins <atimmins(a)blueyonder.co.uk>
+ * Copyright 2003-7 John M Bell <jmb202(a)ecs.soton.ac.uk>
*/
#ifndef _NETSURF_UTILS_CONFIG_H_
@@ -39,7 +38,7 @@
#define WITH_JPEG
#define WITH_MNG
#define WITH_GIF
-#if defined(riscos) || defined(ncos)
+#if defined(riscos)
#define WITH_NS_SVG /* internal SVG renderer */
#define WITH_DRAW
#define WITH_SPRITE
@@ -47,7 +46,7 @@
#endif
/* Platform specific features */
-#if defined(riscos) || defined(ncos)
+#if defined(riscos)
/* Plugin module */
#define WITH_PLUGIN
/* Acorn URI protocol support */
@@ -71,7 +70,7 @@
#error Cannot build WITH_NS_SVG and WITH_RSVG both enabled
#endif
-#if defined(riscos) || defined(ncos) || defined(DEBUG_BUILD)
+#if defined(riscos) || defined(DEBUG_BUILD)
/* Export modules */
#define WITH_SAVE_COMPLETE
#define WITH_DRAW_EXPORT