More AmigaOS specific changes.
diff --git a/expat/amiga/Makefile b/expat/amiga/Makefile
index eadb8a3..4fa1f4b 100644
--- a/expat/amiga/Makefile
+++ b/expat/amiga/Makefile
@@ -19,6 +19,7 @@
@echo " all - make libraries, xmlwf, examples and runs tests"
@echo " install - install expat libraries and tools into SDK"
@echo " clean - clean object files"
+ @echo " check - run all the tests"
@echo " package - prepare distribution archive"
all: clib2 newlib library so check
@@ -48,6 +49,8 @@
-delete T:expat all force quiet
makedir all T:expat/Workbench/Libs
copy clone libs/expat.library T:expat/Workbench/Libs
+ makedir all T:expat/Workbench/SObjs
+ copy clone so/libexpat.so T:expat/Workbench/SObjs
makedir all T:expat/SDK/Local/C
copy clone libs/xmlwf T:expat/SDK/Local/C
makedir all T:expat/SDK/Local/clib2/lib
@@ -85,6 +88,7 @@
clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o
$(LIBTOOL) $(LTFLAGS) $@ $^
+ protect $@ -e
clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
expat_external.h internal.h amigaconfig.h
@@ -148,6 +152,7 @@
newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o
$(LIBTOOL) $(LTFLAGS) $@ $^
+ protect $@ -e
newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
expat_external.h internal.h amigaconfig.h
@@ -211,6 +216,7 @@
libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o libs/stdlib.o newlib/libexpat.a
$(CC) -mcrt=newlib -nostartfiles -nostdlib $^ -o $@ newlib/libexpat.a
+ protect $@ -e
libs/expat_lib.o: expat_lib.c
@@ -276,6 +282,7 @@
so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o
$(CC) -mcrt=newlib -shared -o $@ $^
+ protect $@ -e
so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \
expat_external.h internal.h amigaconfig.h
diff --git a/expat/amiga/README.txt b/expat/amiga/README.txt
index 28b23cf..632772e 100644
--- a/expat/amiga/README.txt
+++ b/expat/amiga/README.txt
@@ -39,6 +39,10 @@
HISTORY
=======
+5.1 - fixed package archive which was missing libexpat.so
+ - fixed library protection bits
+ - fixed up copyright notices
+
5.0 - integrated 68k patches from Fredrik Wikstrom which means
expat.library is now callable from 68k code
- bumped version for the addition of the 68k interface so
diff --git a/expat/amiga/expat_68k_handler_stubs.c b/expat/amiga/expat_68k_handler_stubs.c
index 047bcfa..c09ebac 100755
--- a/expat/amiga/expat_68k_handler_stubs.c
+++ b/expat/amiga/expat_68k_handler_stubs.c
@@ -1,3 +1,26 @@
+/*
+** Copyright (c) 2001-2009 Expat maintainers.
+**
+** Permission is hereby granted, free of charge, to any person obtaining
+** a copy of this software and associated documentation files (the
+** "Software"), to deal in the Software without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Software, and to
+** permit persons to whom the Software is furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
#include "expat_68k.h"
#include <exec/emulation.h>
#include <proto/exec.h>
diff --git a/expat/amiga/expat_lib.c b/expat/amiga/expat_lib.c
index 2b82e19..9fd05e5 100755
--- a/expat/amiga/expat_lib.c
+++ b/expat/amiga/expat_lib.c
@@ -27,8 +27,8 @@
#define LIBNAME "expat.library"
#define LIBPRI 0
#define VERSION 5
-#define REVISION 0
-#define VSTRING "expat.library 5.0 (30.1.2009)" /* dd.mm.yyyy */
+#define REVISION 1
+#define VSTRING "expat.library 5.1 (31.1.2009)" /* dd.mm.yyyy */
static const char* __attribute__((used)) verstag = "\0$VER: " VSTRING;
diff --git a/expat/amiga/expat_vectors.c b/expat/amiga/expat_vectors.c
index 14fb3be..cf48950 100644
--- a/expat/amiga/expat_vectors.c
+++ b/expat/amiga/expat_vectors.c
@@ -1,5 +1,5 @@
/*
-** Copyright (c) 2001-2007 Expat maintainers.
+** Copyright (c) 2001-2009 Expat maintainers.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
@@ -8,10 +8,10 @@
** distribute, sublicense, and/or sell copies of the Software, and to
** permit persons to whom the Software is furnished to do so, subject to
** the following conditions:
-**
+**
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Software.
-**
+**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
diff --git a/expat/amiga/stdlib.c b/expat/amiga/stdlib.c
index 8c31f23..3d03a1c 100755
--- a/expat/amiga/stdlib.c
+++ b/expat/amiga/stdlib.c
@@ -1,5 +1,5 @@
/*
-** Copyright (c) 2001-2007 Expat maintainers.
+** Copyright (c) 2001-2009 Expat maintainers.
**
** Permission is hereby granted, free of charge, to any person obtaining
** a copy of this software and associated documentation files (the
@@ -8,10 +8,10 @@
** distribute, sublicense, and/or sell copies of the Software, and to
** permit persons to whom the Software is furnished to do so, subject to
** the following conditions:
-**
+**
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Software.
-**
+**
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
