From e1b6179f9b740a43185742d2d72531937fe12066 Mon Sep 17 00:00:00 2001
From: Philip Pemberton <phil@philpem.me.uk>
Date: Thu, 5 Jun 2003 14:33:18 +0000
Subject: [project @ 2003-06-05 14:33:18 by philpem] Added test GIF

svn path=/import/netsurf/; revision=164
---
 !NetSurf/Resources/gif,695 | Bin 0 -> 6144 bytes
 css/makeenum               |   4 ++--
 makefile                   |  54 ++++++++++++++++++++-------------------------
 3 files changed, 26 insertions(+), 32 deletions(-)
 create mode 100644 !NetSurf/Resources/gif,695

diff --git a/!NetSurf/Resources/gif,695 b/!NetSurf/Resources/gif,695
new file mode 100644
index 000000000..916014e2c
Binary files /dev/null and b/!NetSurf/Resources/gif,695 differ
diff --git a/css/makeenum b/css/makeenum
index 6501d3704..60cda673b 100755
--- a/css/makeenum
+++ b/css/makeenum
@@ -1,5 +1,5 @@
-#!/usr/bin/perl -W
-# $Id: makeenum,v 1.1 2003/04/04 15:19:31 bursa Exp $
+#!/usr/bin/perl
+# $Id: makeenum,v 1.2 2003/06/05 14:33:18 philpem Exp $
 
 $out = shift or die "usage: makeenum leafname";
 
diff --git a/makefile b/makefile
index e03657bef..fa291a49f 100644
--- a/makefile
+++ b/makefile
@@ -1,39 +1,36 @@
-# $Id: makefile,v 1.31 2003/06/05 14:01:37 bursa Exp $
+# $Id: makefile,v 1.32 2003/06/05 14:33:18 philpem Exp $
 
-CC = riscos-gcc
+CC = gcc
 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 gif.o gui.o jpeg.o png.o theme.o \
+	filetype.o font.o gui.o jpeg.o png.o gif.o theme.o \
 	utils.o plugin.o options.o
-DOCUMENTS = Themes.html	
 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 \
 	-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
-	-Wnested-externs -Winline -Wno-unused-parameter
-CFLAGS = $(WARNFLAGS) -I.. -I/usr/local/riscoslibs/include \
+	-Wnested-externs -Winline -mthrowback
+# -Wno-unused-parameter
+CFLAGS = $(WARNFLAGS) -I.. -INetsurfLib: -IOSLib: \
 	-Dfd_set=long -mpoke-function-name
 LDFLAGS = \
-	/usr/local/riscoslibs/libungif/libungif.ro \
-	/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
+	NetsurfLib:libgif32.o \
+	NetsurfLib:libxml232.o \
+	OSLib:OSLib32.o \
+	NetsurfLib:libcurl32.o \
+	NetsurfLib:libpng32.o \
+	NetsurfLib:libz32.o
 
 OBJDIR = $(shell $(CC) -dumpmachine)
 SOURCES=$(OBJECTS:.o=.c)
 OBJS=$(OBJECTS:%.o=$(OBJDIR)/%.o)
-DOCDIR = !NetSurf/Docs
-DOCS=$(DOCUMENTS:%.html=$(DOCDIR)/%.html)
 
 # targets
-all: !NetSurf/!RunImage,ff8 $(DOCS)
-!NetSurf/!RunImage,ff8 : $(OBJS)
+!NetSurf/!RunImage : $(OBJS)
 	$(CC) -o $@ $(LDFLAGS) $^
-netsurf.zip: !NetSurf/!RunImage,ff8 $(DOCS)
+netsurf.zip: !NetSurf/!RunImage
 	rm netsurf.zip; riscos-zip -9vr, netsurf.zip !NetSurf
 
 # pattern rule for c source
@@ -42,27 +39,24 @@ $(OBJDIR)/%.o : %.c
 
 # special cases
 css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
-	cd ..; /usr/bin/perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
+	cd ..
+	perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
 css/parser.c: css/parser.y
-	-cd css; lemon parser.y
+	cd css
+	lemon parser.y
 css/scanner.c css/scanner.h: css/scanner.l
-	cd css; flex scanner.l
-	
-# create documentation
-$(DOCDIR)/%.html: documentation/%.xml
-	# syntax: xsltproc [options] -o <output file> <XSL stylesheet> <input file>
-	# --nonet prevents connection to the web to find the stylesheet
-	xsltproc -o $@ http://www.movspclr.co.uk/dtd/100/prm-html.xsl $<
+	dir css
+	flex scanner.l
 
 # generate dependencies
-depend : $(SOURCES)
-	-mkdir $(OBJDIR)
-	$(CC) -MM -MG $(CFLAGS) $^ | sed 's|.*\.o:|$(OBJDIR)/&|g' > $@
+# depend : $(SOURCES)
+#	-mkdir $(OBJDIR)
+#	$(CC) -MM -MG $(CFLAGS) $^ | sed 's|.*\.o:|$(OBJDIR)/&|g' > $@
 
 # remove generated files
 clean :
 	-rm $(OBJDIR)/* depend css/css_enum.c css/css_enum.h \
 		css/parser.c css/parser.h css/scanner.c css/scanner.h
 
-include depend
+# include depend
 
-- 
cgit v1.2.3