mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-23 14:59:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2003-05-31 19:01:43 by jmb]

Browse Source 
Fix makefile after duff checkin

svn path=/import/netsurf/; revision=139
This commit is contained in:
John Mark Bell 2003-05-31 19:01:43 +00:00
parent 089785bc37
commit f7c6c2c613
2 changed files with 4 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
makefile
View File

@ -1,57 +1,12 @@
# $Id: makefile,v 1.22 2003/05/31 18:50:28 jmb Exp $
# $Id: makefile,v 1.23 2003/05/31 19:01:43 jmb Exp $
CC = riscos-gcc
<<<<<<< makefile
OBJECTS = \
content/arm-riscos-aof/cache.o content/arm-riscos-aof/content.o \
content/arm-riscos-aof/fetch.o content/arm-riscos-aof/fetchcache.o \
desktop/arm-riscos-aof/browser.o desktop/arm-riscos-aof/netsurf.o \
render/arm-riscos-aof/box.o \
render/arm-riscos-aof/html.o \
render/arm-riscos-aof/layout.o render/arm-riscos-aof/textplain.o \
riscos/arm-riscos-aof/font.o riscos/arm-riscos-aof/gui.o \
riscos/arm-riscos-aof/theme.o riscos/arm-riscos-aof/jpeg.o \
riscos/arm-riscos-aof/filetype.o utils/arm-riscos-aof/utils.o \
riscos/arm-riscos-aof/png.o riscos/arm-riscos-aof/plugin.o \
css/arm-riscos-aof/css.o css/arm-riscos-aof/css_enum.o \
css/arm-riscos-aof/parser.o css/arm-riscos-aof/scanner.o \
css/arm-riscos-aof/ruleset.o
HEADERS = \
content/cache.h content/content.h content/fetch.h content/fetchcache.h \
desktop/browser.h desktop/gui.h desktop/netsurf.h render/box.h \
render/html.h render/layout.h \
riscos/font.h riscos/gui.h riscos/theme.h utils/log.h \
utils/utils.h render/textplain.h \
css/css.h css/css_enum.h css/parser.h css/scanner.h \
riscos/png.h riscos/plugin.h
LIBS = \
/usr/local/riscoslibs/libxml2/libxml2.ro \
/usr/local/riscoslibs/OSLib/OSLib32.ro \
/usr/local/riscoslibs/curl/libcurl.ro \
/usr/local/riscoslibs/libpng/libpng.ro \
/usr/local/riscoslibs/zlib/libz.ro
!NetSurf/!RunImage,ff8: $(OBJECTS)
$(CC) $(FLAGS) -o !NetSurf/!RunImage,ff8 $(OBJECTS) $(LIBS)
render/arm-riscos-aof/%.o: render/%.c $(HEADERS)
$(CC) $(FLAGS) -o $@ -c $<
riscos/arm-riscos-aof/%.o: riscos/%.c $(HEADERS)
$(CC) $(FLAGS) -o $@ -c $<
desktop/arm-riscos-aof/%.o: desktop/%.c $(HEADERS)
$(CC) $(FLAGS) -o $@ -c $<
content/arm-riscos-aof/%.o: content/%.c $(HEADERS)
$(CC) $(FLAGS) -o $@ -c $<
=======
OBJECTS = cache.o content.o fetch.o fetchcache.o \
css.o css_enum.o parser.o ruleset.o scanner.o \
browser.o netsurf.o \
box.o html.o layout.o textplain.o \
filetype.o font.o gui.o jpeg.o png.o theme.o \
utils.o
utils.o plugin.o
VPATH = content:css:desktop:render:riscos:utils
WARNFLAGS = -W -Wall -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-qual \
-Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes \
@ -75,7 +30,6 @@ OBJS=$(OBJECTS:%.o=$(OBJDIR)/%.o)
$(CC) -o $@ $(LDFLAGS) $^
netsurf.zip: !NetSurf/!RunImage,ff8
rm netsurf.zip; riscos-zip -9vr, netsurf.zip !NetSurf
>>>>>>> 1.21
# pattern rule for c source
$(OBJDIR)/%.o : %.c

4
render/box.c
View File

@ -1,5 +1,5 @@
/**
* $Id: box.c,v 1.46 2003/05/31 18:47:00 jmb Exp $
* $Id: box.c,v 1.47 2003/05/31 19:01:43 jmb Exp $
*/
#include <assert.h>
@ -16,7 +16,7 @@
#include "netsurf/riscos/plugin.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/utils.h"
#define NDEBUG
//#define NDEBUG
/**
* internal functions