summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2003-05-31 19:01:43 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2003-05-31 19:01:43 +0000
commitf7c6c2c613f497ffd05d5a0a85c500830a1642c5 (patch)
tree19656929573258c5783cfba458a43b57436f332d /makefile
parent089785bc37e2c3ff4af36574424d0d5c9aab793c (diff)
downloadnetsurf-f7c6c2c613f497ffd05d5a0a85c500830a1642c5.tar.gz
netsurf-f7c6c2c613f497ffd05d5a0a85c500830a1642c5.tar.bz2
[project @ 2003-05-31 19:01:43 by jmb]
Fix makefile after duff checkin svn path=/import/netsurf/; revision=139
Diffstat (limited to 'makefile')
-rw-r--r--makefile50
1 files changed, 2 insertions, 48 deletions
diff --git a/makefile b/makefile
index f64e8eefa..e3a033dc1 100644
--- a/makefile
+++ b/makefile
@@ -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