summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2003-05-31 18:50:28 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2003-05-31 18:50:28 +0000
commit089785bc37e2c3ff4af36574424d0d5c9aab793c (patch)
treebf552180f49979e163dba6dbdb48ba62e1c10541
parent51ee42fc080293aba2bcde9c85e06282530b8ab6 (diff)
downloadnetsurf-089785bc37e2c3ff4af36574424d0d5c9aab793c.tar.gz
netsurf-089785bc37e2c3ff4af36574424d0d5c9aab793c.tar.bz2
[project @ 2003-05-31 18:50:28 by jmb]
Begin support for <OBJECT>, <EMBED> and <APPLET> tags. NB: this doesn't work yet svn path=/import/netsurf/; revision=138
-rw-r--r--makefile48
1 files changed, 47 insertions, 1 deletions
diff --git a/makefile b/makefile
index f626313ee..f64e8eefa 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,51 @@
-# $Id: makefile,v 1.21 2003/05/31 18:40:46 bursa Exp $
+# $Id: makefile,v 1.22 2003/05/31 18:50:28 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 \
@@ -30,6 +75,7 @@ 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